Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/services/test/api_pb2_v1_helpers_test.py b/services/test/api_pb2_v1_helpers_test.py
index 460f5c3..ac94d57 100644
--- a/services/test/api_pb2_v1_helpers_test.py
+++ b/services/test/api_pb2_v1_helpers_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.
"""Tests for the API v1 helpers."""
from __future__ import print_function
@@ -17,10 +16,10 @@
from framework import profiler
from services import api_pb2_v1_helpers
from services import service_manager
-from proto import api_pb2_v1
-from proto import project_pb2
-from proto import tracker_pb2
-from proto import usergroup_pb2
+from mrproto import api_pb2_v1
+from mrproto import project_pb2
+from mrproto import tracker_pb2
+from mrproto import usergroup_pb2
from testing import fake
from tracker import tracker_bizobj
@@ -279,7 +278,8 @@
# TODO(jrobbins): set up a lot more fields.
for cls in [api_pb2_v1.IssueWrapper, api_pb2_v1.IssuesGetInsertResponse]:
- result = api_pb2_v1_helpers.convert_issue(cls, issue, mar, self.services)
+ result = api_pb2_v1_helpers.convert_issue(
+ cls, issue, mar, self.services, migrated_id='12345')
self.assertEqual(1, result.id)
self.assertEqual('one', result.title)
self.assertEqual('one', result.summary)
@@ -323,6 +323,7 @@
[api_pb2_v1.Phase(phaseName="JustAPhase", rank=4),
api_pb2_v1.Phase(phaseName="NotAPhase", rank=9)
])
+ self.assertEqual('12345', result.migrated_id)
# TODO(jrobbins): check a lot more fields.