| commit | 9f9ade5a5fd4ebe76e0ad0d7a91f386f475e8fe9 | [log] [tgz] |
|---|---|---|
| author | Adrià Vilanova MartÃnez <me@avm99963.com> | Mon Oct 10 23:20:11 2022 +0200 |
| committer | gerritbot <gerritbot@avm99963.com> | Mon Oct 10 23:31:26 2022 +0200 |
| tree | 8ae2c3467f59d3fc5415e1793a4f581e56a52122 | |
| parent | 1663d14d8132d1d2bacc6302122f4ce2c8af201a [diff] [blame] |
Merge branch 'main' into avm99963-monorail Merged commit 3779da353b36d43cf778e7d4f468097714dd4540 GitOrigin-RevId: 6451a5c6b75afb0fd1f37b3f14521148d0722ea8
diff --git a/services/test/star_svc_test.py b/services/test/star_svc_test.py index 03a0d23..3a5ce74 100644 --- a/services/test/star_svc_test.py +++ b/services/test/star_svc_test.py
@@ -10,7 +10,10 @@ import unittest -import mox +try: + from mox3 import mox +except ImportError: + import mox import mock from google.appengine.ext import testbed