Merge branch 'main' into avm99963-monorail
Merged commit 3779da353b36d43cf778e7d4f468097714dd4540
GitOrigin-RevId: 6451a5c6b75afb0fd1f37b3f14521148d0722ea8
diff --git a/api/v3/test/hotlists_servicer_test.py b/api/v3/test/hotlists_servicer_test.py
index e9808b5..170cf2e 100644
--- a/api/v3/test/hotlists_servicer_test.py
+++ b/api/v3/test/hotlists_servicer_test.py
@@ -23,6 +23,7 @@
from framework import exceptions
from framework import monorailcontext
from framework import permissions
+from framework import sorting
from features import features_constants
from testing import fake
from services import features_svc
@@ -38,6 +39,7 @@
issue=fake.IssueService(),
project=fake.ProjectService(),
config=fake.ConfigService(),
+ cache_manager=fake.CacheManager(),
user=fake.UserService(),
usergroup=fake.UserGroupService())
self.hotlists_svcr = hotlists_servicer.HotlistsServicer(
@@ -110,6 +112,7 @@
is_private=True)
self.hotlist_resource_name = rnc.ConvertHotlistName(
self.hotlist_1.hotlist_id)
+ sorting.InitializeArtValues(self.services)
def CallWrapped(self, wrapped_handler, mc, *args, **kwargs):
self.converter = converters.Converter(mc, self.services)
diff --git a/api/v3/test/monorail_servicer_test.py b/api/v3/test/monorail_servicer_test.py
index 3569879..2abcaf9 100644
--- a/api/v3/test/monorail_servicer_test.py
+++ b/api/v3/test/monorail_servicer_test.py
@@ -11,9 +11,11 @@
import time
import unittest
import mock
-import mox
+try:
+ from mox3 import mox
+except ImportError:
+ import mox
-from components.prpc import server
from components.prpc import codes
from components.prpc import context
from google.appengine.ext import testbed