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

Unified Diff: tests/git_common_test.py

Issue 2075603002: Refactor git_common config and die (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Fix unintended change Created 4 years, 6 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 | « git_upstream_diff.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/git_common_test.py
diff --git a/tests/git_common_test.py b/tests/git_common_test.py
index 5a16fa31bf067c6c59adf8fbf4c553dde5432a74..66211796fe9cf1e4c1ec6d433859c37c27a40dd6 100755
--- a/tests/git_common_test.py
+++ b/tests/git_common_test.py
@@ -415,26 +415,29 @@ class GitMutableFunctionsTest(git_test_utils.GitRepoReadWriteTestBase,
def testConfig(self):
self.repo.git('config', '--add', 'happy.derpies', 'food')
- self.assertEquals(self.repo.run(self.gc.config_list, 'happy.derpies'),
+ self.assertEquals(self.repo.run(self.gc.get_config_list, 'happy.derpies'),
['food'])
- self.assertEquals(self.repo.run(self.gc.config_list, 'sad.derpies'), [])
+ self.assertEquals(self.repo.run(self.gc.get_config_list, 'sad.derpies'), [])
self.repo.git('config', '--add', 'happy.derpies', 'cat')
- self.assertEquals(self.repo.run(self.gc.config_list, 'happy.derpies'),
+ self.assertEquals(self.repo.run(self.gc.get_config_list, 'happy.derpies'),
['food', 'cat'])
- self.assertEquals('cat', self.repo.run(self.gc.config, 'dude.bob', 'cat'))
+ self.assertEquals('cat', self.repo.run(self.gc.get_config, 'dude.bob',
+ 'cat'))
self.repo.run(self.gc.set_config, 'dude.bob', 'dog')
- self.assertEquals('dog', self.repo.run(self.gc.config, 'dude.bob', 'cat'))
+ self.assertEquals('dog', self.repo.run(self.gc.get_config, 'dude.bob',
+ 'cat'))
self.repo.run(self.gc.del_config, 'dude.bob')
# This should work without raising an exception
self.repo.run(self.gc.del_config, 'dude.bob')
- self.assertEquals('cat', self.repo.run(self.gc.config, 'dude.bob', 'cat'))
+ self.assertEquals('cat', self.repo.run(self.gc.get_config, 'dude.bob',
+ 'cat'))
self.assertEquals('origin/master', self.repo.run(self.gc.root))
@@ -559,10 +562,11 @@ class GitMutableStructuredTest(git_test_utils.GitRepoReadWriteTestBase,
)
self.assertEqual(
- self.repo['B'], self.repo.run(self.gc.config, 'branch.branch_K.base')
+ self.repo['B'], self.repo.run(self.gc.get_config, 'branch.branch_K.base')
)
self.assertEqual(
- 'branch_G', self.repo.run(self.gc.config, 'branch.branch_K.base-upstream')
+ 'branch_G', self.repo.run(self.gc.get_config,
+ 'branch.branch_K.base-upstream')
)
# deadbeef is a bad hash, so this will result in repo['B']
@@ -588,8 +592,8 @@ class GitMutableStructuredTest(git_test_utils.GitRepoReadWriteTestBase,
self.repo.run(self.gc.remove_merge_base, 'branch_K')
self.repo.run(self.gc.remove_merge_base, 'branch_L')
- self.assertEqual(None,
- self.repo.run(self.gc.config, 'branch.branch_K.base'))
+ self.assertEqual(None, self.repo.run(self.gc.get_config,
+ 'branch.branch_K.base'))
self.assertEqual({}, self.repo.run(self.gc.branch_config_map, 'base'))
« no previous file with comments | « git_upstream_diff.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698