Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Unified Diff: scripts/common/unittests/cros_chromite_test.py

Issue 1402253002: CrOS: Load Chromite pins from JSON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebase (without pin JSON). Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/common/env.py ('k') | scripts/slave/unittests/recipe_lint_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/common/unittests/cros_chromite_test.py
diff --git a/scripts/common/unittests/cros_chromite_test.py b/scripts/common/unittests/cros_chromite_test.py
index a9dc98eee9ad99b9df6c220416eec25badf84ca8..09d2cff0d9f7b0cc709ea422208eb1233fecddee 100755
--- a/scripts/common/unittests/cros_chromite_test.py
+++ b/scripts/common/unittests/cros_chromite_test.py
@@ -3,7 +3,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-"""Unit test suite for common.cros_chromite."""
+"""Unit test suite for common.cros.chromite."""
import test_env
@@ -182,15 +182,24 @@ class ChromiteConfigTestCase(unittest.TestCase):
class ChromitePinManagerTestCase(unittest.TestCase):
def testGetPinnedBranch_PinnedBranchReturnsPinnedValue(self):
- pm = cros_chromite.ChromitePinManager(pinned={'a': 'b'}, require=True)
+ pm = cros_chromite.ChromitePinManager(
+ 'test',
+ pinned={'a': 'b'},
+ require=True)
self.assertEqual(pm.GetPinnedBranch('a'), 'b')
def testGetPinnedBranch_UnpinnedBranchReturnsBranch(self):
- pm = cros_chromite.ChromitePinManager(pinned={'a': 'b'}, require=False)
+ pm = cros_chromite.ChromitePinManager(
+ 'test',
+ pinned={'a': 'b'},
+ require=False)
self.assertEqual(pm.GetPinnedBranch('foo'), 'foo')
def testGetPinnedBranch_UnpinnedBranchReturnsErrorWithRequiredPinning(self):
- pm = cros_chromite.ChromitePinManager(pinned={'a': 'b'}, require=True)
+ pm = cros_chromite.ChromitePinManager(
+ 'test',
+ pinned={'a': 'b'},
+ require=True)
self.assertRaises(cros_chromite.ChromiteError,
pm.GetPinnedBranch, 'foo')
@@ -205,13 +214,17 @@ class ChromiteConfigManagerTestCase(unittest.TestCase):
def testGetConfig_ValidSucceeds(self):
manager = cros_chromite.ChromiteConfigManager(self.cache,
- cros_chromite.ChromitePinManager({'test': 'v1'}))
+ cros_chromite.ChromitePinManager(
+ 'test',
+ {'test': 'v1'}))
self.assertTrue(isinstance(manager.GetConfig('test'),
cros_chromite.ChromiteConfig))
def testGetConfig_InvalidJsonRaises(self):
manager = cros_chromite.ChromiteConfigManager(self.cache,
- cros_chromite.ChromitePinManager({'test': 'v_invalid'}))
+ cros_chromite.ChromitePinManager(
+ 'test',
+ {'test': 'v_invalid'}))
self.assertRaises(cros_chromite.ChromiteError, manager.GetConfig, 'test')
def testGetConfig_MissingRaises(self):
@@ -223,7 +236,9 @@ class ChromiteFetcherTestCase(unittest.TestCase):
def setUp(self):
self.fetcher = cros_chromite.ChromiteFetcher(
- cros_chromite.ChromitePinManager({'test': 'v1'})
+ cros_chromite.ChromitePinManager(
+ 'test',
+ {'test': 'v1'})
)
@staticmethod
« no previous file with comments | « scripts/common/env.py ('k') | scripts/slave/unittests/recipe_lint_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698