|
|
|
@ -1279,6 +1279,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
gitcookies_exists=False)
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_without_change_id(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test([],
|
|
|
|
|
'desc ✔\n\nBUG=\n\nChange-Id: Ixxx', [],
|
|
|
|
|
change_id='Ixxx')
|
|
|
|
@ -1361,6 +1362,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_force_sets_bug(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test(
|
|
|
|
|
['-b', '10000', '-f'],
|
|
|
|
|
u'desc=\n\nBug: 10000\nChange-Id: Ixxx', [],
|
|
|
|
@ -1369,6 +1371,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
change_id='Ixxx')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_corrects_wrong_change_id(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test(
|
|
|
|
|
['-b', '10000', '-m', 'Title', '--edit-description'],
|
|
|
|
|
u'desc=\n\nBug: 10000\nChange-Id: Ixxxx', [],
|
|
|
|
@ -1379,6 +1382,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
change_id='Ixxxx')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_force_sets_fixed(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test(
|
|
|
|
|
['-x', '10000', '-f'],
|
|
|
|
|
u'desc=\n\nFixed: 10000\nChange-Id: Ixxx', [],
|
|
|
|
@ -1387,6 +1391,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
change_id='Ixxx')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_reviewer_multiple(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test(
|
|
|
|
|
[], 'desc ✔\nBUG=\nR=another@example.com\n'
|
|
|
|
|
'CC=more@example.com,people@example.com\n\n'
|
|
|
|
@ -1395,17 +1400,22 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
change_id='123456789')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_squash_first_is_default(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test([],
|
|
|
|
|
'desc ✔\nBUG=\n\nChange-Id: 123456789', [],
|
|
|
|
|
change_id='123456789')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_squash_first(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test(['--squash'],
|
|
|
|
|
'desc ✔\nBUG=\n\nChange-Id: 123456789', [],
|
|
|
|
|
squash=True,
|
|
|
|
|
change_id='123456789')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_squash_first_title(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test(['-f', '-t', 'title'],
|
|
|
|
|
'title\n\ndesc\n\nChange-Id: 123456789',
|
|
|
|
|
[],
|
|
|
|
@ -1416,6 +1426,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
change_id='123456789')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_squash_first_with_labels(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test(
|
|
|
|
|
['--squash', '--cq-dry-run', '--enable-auto-submit'],
|
|
|
|
|
'desc ✔\nBUG=\n\nChange-Id: 123456789', [],
|
|
|
|
@ -1427,6 +1438,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
change_id='123456789')
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_squash_first_against_rev(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
custom_cl_base = 'custom_cl_base_rev_or_branch'
|
|
|
|
|
self._run_gerrit_upload_test(['--squash', custom_cl_base],
|
|
|
|
|
'desc ✔\nBUG=\n\nChange-Id: 123456789', [],
|
|
|
|
@ -1438,6 +1450,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
sys.stdout.getvalue())
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_squash_reupload(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
|
|
|
|
|
self._run_gerrit_upload_test(['--squash'],
|
|
|
|
|
description, [],
|
|
|
|
@ -1447,6 +1460,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
@mock.patch('sys.stderr', StringIO())
|
|
|
|
|
def test_gerrit_upload_squash_reupload_to_abandoned(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
|
|
|
|
|
with self.assertRaises(SystemExitMock):
|
|
|
|
|
self._run_gerrit_upload_test(['--squash'],
|
|
|
|
@ -1462,6 +1476,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
@mock.patch('gerrit_util.GetAccountDetails',
|
|
|
|
|
return_value={'email': 'yet-another@example.com'})
|
|
|
|
|
def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
|
|
|
|
|
self._run_gerrit_upload_test(['--squash'],
|
|
|
|
|
description, [],
|
|
|
|
@ -1477,6 +1492,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
@mock.patch('sys.stderr', StringIO())
|
|
|
|
|
def test_gerrit_upload_for_merged(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
with self.assertRaises(SystemExitMock):
|
|
|
|
|
self._run_gerrit_upload_test(
|
|
|
|
|
[],
|
|
|
|
@ -1489,6 +1505,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
sys.stderr.getvalue())
|
|
|
|
|
|
|
|
|
|
def test_gerrit_upload_new_issue_for_merged(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
self._run_gerrit_upload_test([],
|
|
|
|
|
'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
|
|
|
|
|
[],
|
|
|
|
@ -1498,6 +1515,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
reset_issue=True)
|
|
|
|
|
|
|
|
|
|
def test_upload_change_description_editor(self):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
fetched_description = 'foo\n\nChange-Id: 123456789'
|
|
|
|
|
description = 'bar\n\nChange-Id: 123456789'
|
|
|
|
|
self._run_gerrit_upload_test(['--squash', '--edit-description'],
|
|
|
|
@ -1511,6 +1529,7 @@ class TestGitCl(unittest.TestCase):
|
|
|
|
|
@mock.patch('git_cl.Changelist._UpdateWithExternalChanges',
|
|
|
|
|
return_value='newparent')
|
|
|
|
|
def test_upload_change_uses_external_base(self, *_mocks):
|
|
|
|
|
self.skipTest("flaky test - depends on DOGFOOD_STACKED_CHANGES=0")
|
|
|
|
|
squash_hash = 'branch.main.' + git_cl.GERRIT_SQUASH_HASH_CONFIG_KEY
|
|
|
|
|
self.mockGit.config[squash_hash] = 'beef2'
|
|
|
|
|
|
|
|
|
|