Merge branch 'main' into avm99963-monorail
Merged commit 3779da353b36d43cf778e7d4f468097714dd4540
GitOrigin-RevId: 6451a5c6b75afb0fd1f37b3f14521148d0722ea8
diff --git a/search/test/backendnonviewable_test.py b/search/test/backendnonviewable_test.py
index 6c50fb7..5360a93 100644
--- a/search/test/backendnonviewable_test.py
+++ b/search/test/backendnonviewable_test.py
@@ -9,7 +9,10 @@
from __future__ import absolute_import
import unittest
-import mox
+try:
+ from mox3 import mox
+except ImportError:
+ import mox
from google.appengine.api import memcache
from google.appengine.ext import testbed
@@ -36,8 +39,7 @@
self.mr.shard_id = 2
self.mr.invalidation_timestep = 12345
- self.servlet = backendnonviewable.BackendNonviewable(
- 'req', 'res', services=self.services)
+ self.servlet = backendnonviewable.BackendNonviewable(services=self.services)
self.mox = mox.Mox()
self.testbed = testbed.Testbed()