Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/test/projectsearch_test.py b/sitewide/test/projectsearch_test.py
index a0d941d..cd63e7f 100644
--- a/sitewide/test/projectsearch_test.py
+++ b/sitewide/test/projectsearch_test.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Unittests for the projectsearch module."""
from __future__ import print_function
@@ -12,7 +11,7 @@
import unittest
from framework import profiler
-from proto import project_pb2
+from mrproto import project_pb2
from services import service_manager
from sitewide import projectsearch
from testing import fake
@@ -24,14 +23,14 @@
def setUp(self):
self.services = service_manager.Services(
project=fake.ProjectService())
- self.services.project.GetVisibleLiveProjects = mock.MagicMock()
+ self.services.project.GetVisibleProjects = mock.MagicMock()
for idx, letter in enumerate('abcdefghijklmnopqrstuvwxyz'):
self.services.project.TestAddProject(letter, project_id=idx + 1)
for idx in range(27, 110):
self.services.project.TestAddProject(str(idx), project_id=idx)
- self.addCleanup(mock.patch.stopall())
+ self.addCleanup(mock.patch.stopall)
def TestPipeline(self, expected_last, expected_len):
mr = testing_helpers.MakeMonorailRequest()
@@ -47,29 +46,28 @@
return pipeline
def testZeroResults(self):
- self.services.project.GetVisibleLiveProjects.return_value = []
+ self.services.project.GetVisibleProjects.return_value = []
pipeline = self.TestPipeline(0, 0)
- self.services.project.GetVisibleLiveProjects.assert_called_once()
+ self.services.project.GetVisibleProjects.assert_called_once()
self.assertListEqual([], pipeline.visible_results)
def testNonzeroResults(self):
- self.services.project.GetVisibleLiveProjects.return_value = [1, 2, 3]
+ self.services.project.GetVisibleProjects.return_value = [1, 2, 3]
pipeline = self.TestPipeline(3, 3)
- self.services.project.GetVisibleLiveProjects.assert_called_once()
+ self.services.project.GetVisibleProjects.assert_called_once()
self.assertListEqual(
[1, 2, 3], [p.project_id for p in pipeline.visible_results])
def testTwoPageResults(self):
"""Test more than one pagination page of results."""
- self.services.project.GetVisibleLiveProjects.return_value = list(
- range(1, 106))
+ self.services.project.GetVisibleProjects.return_value = list(range(1, 106))
pipeline = self.TestPipeline(100, 100)
- self.services.project.GetVisibleLiveProjects.assert_called_once()
+ self.services.project.GetVisibleProjects.assert_called_once()
self.assertEqual(
'/hosting/search?num=100&start=100', pipeline.pagination.next_url)