From ea2e330e43c182dc16b0111ebc69ee5a71ee4ce1 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Sat, 11 Mar 2023 06:46:20 +0000 Subject: Format codebase with black and check formatting in CQ Apply rules set by https://gerrit-review.googlesource.com/c/git-repo/+/362954/ across the codebase and fix any lingering errors caught by flake8. Also check black formatting in run_tests (and CQ). Bug: b/267675342 Change-Id: I972d77649dac351150dcfeb1cd1ad0ea2efc1956 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/363474 Reviewed-by: Mike Frysinger Tested-by: Gavin Mak Commit-Queue: Gavin Mak --- tests/test_subcmds_sync.py | 215 +++++++++++++++++++++++++-------------------- 1 file changed, 121 insertions(+), 94 deletions(-) (limited to 'tests/test_subcmds_sync.py') diff --git a/tests/test_subcmds_sync.py b/tests/test_subcmds_sync.py index 236d54e5..5c8e606e 100644 --- a/tests/test_subcmds_sync.py +++ b/tests/test_subcmds_sync.py @@ -23,111 +23,138 @@ import command from subcmds import sync -@pytest.mark.parametrize('use_superproject, cli_args, result', [ - (True, ['--current-branch'], True), - (True, ['--no-current-branch'], True), - (True, [], True), - (False, ['--current-branch'], True), - (False, ['--no-current-branch'], False), - (False, [], None), -]) +@pytest.mark.parametrize( + "use_superproject, cli_args, result", + [ + (True, ["--current-branch"], True), + (True, ["--no-current-branch"], True), + (True, [], True), + (False, ["--current-branch"], True), + (False, ["--no-current-branch"], False), + (False, [], None), + ], +) def test_get_current_branch_only(use_superproject, cli_args, result): - """Test Sync._GetCurrentBranchOnly logic. + """Test Sync._GetCurrentBranchOnly logic. - Sync._GetCurrentBranchOnly should return True if a superproject is requested, - and otherwise the value of the current_branch_only option. - """ - cmd = sync.Sync() - opts, _ = cmd.OptionParser.parse_args(cli_args) + Sync._GetCurrentBranchOnly should return True if a superproject is + requested, and otherwise the value of the current_branch_only option. + """ + cmd = sync.Sync() + opts, _ = cmd.OptionParser.parse_args(cli_args) - with mock.patch('git_superproject.UseSuperproject', - return_value=use_superproject): - assert cmd._GetCurrentBranchOnly(opts, cmd.manifest) == result + with mock.patch( + "git_superproject.UseSuperproject", return_value=use_superproject + ): + assert cmd._GetCurrentBranchOnly(opts, cmd.manifest) == result # Used to patch os.cpu_count() for reliable results. OS_CPU_COUNT = 24 -@pytest.mark.parametrize('argv, jobs_manifest, jobs, jobs_net, jobs_check', [ - # No user or manifest settings. - ([], None, OS_CPU_COUNT, 1, command.DEFAULT_LOCAL_JOBS), - # No user settings, so manifest settings control. - ([], 3, 3, 3, 3), - # User settings, but no manifest. - (['--jobs=4'], None, 4, 4, 4), - (['--jobs=4', '--jobs-network=5'], None, 4, 5, 4), - (['--jobs=4', '--jobs-checkout=6'], None, 4, 4, 6), - (['--jobs=4', '--jobs-network=5', '--jobs-checkout=6'], None, 4, 5, 6), - (['--jobs-network=5'], None, OS_CPU_COUNT, 5, command.DEFAULT_LOCAL_JOBS), - (['--jobs-checkout=6'], None, OS_CPU_COUNT, 1, 6), - (['--jobs-network=5', '--jobs-checkout=6'], None, OS_CPU_COUNT, 5, 6), - # User settings with manifest settings. - (['--jobs=4'], 3, 4, 4, 4), - (['--jobs=4', '--jobs-network=5'], 3, 4, 5, 4), - (['--jobs=4', '--jobs-checkout=6'], 3, 4, 4, 6), - (['--jobs=4', '--jobs-network=5', '--jobs-checkout=6'], 3, 4, 5, 6), - (['--jobs-network=5'], 3, 3, 5, 3), - (['--jobs-checkout=6'], 3, 3, 3, 6), - (['--jobs-network=5', '--jobs-checkout=6'], 3, 3, 5, 6), - # Settings that exceed rlimits get capped. - (['--jobs=1000000'], None, 83, 83, 83), - ([], 1000000, 83, 83, 83), -]) + +@pytest.mark.parametrize( + "argv, jobs_manifest, jobs, jobs_net, jobs_check", + [ + # No user or manifest settings. + ([], None, OS_CPU_COUNT, 1, command.DEFAULT_LOCAL_JOBS), + # No user settings, so manifest settings control. + ([], 3, 3, 3, 3), + # User settings, but no manifest. + (["--jobs=4"], None, 4, 4, 4), + (["--jobs=4", "--jobs-network=5"], None, 4, 5, 4), + (["--jobs=4", "--jobs-checkout=6"], None, 4, 4, 6), + (["--jobs=4", "--jobs-network=5", "--jobs-checkout=6"], None, 4, 5, 6), + ( + ["--jobs-network=5"], + None, + OS_CPU_COUNT, + 5, + command.DEFAULT_LOCAL_JOBS, + ), + (["--jobs-checkout=6"], None, OS_CPU_COUNT, 1, 6), + (["--jobs-network=5", "--jobs-checkout=6"], None, OS_CPU_COUNT, 5, 6), + # User settings with manifest settings. + (["--jobs=4"], 3, 4, 4, 4), + (["--jobs=4", "--jobs-network=5"], 3, 4, 5, 4), + (["--jobs=4", "--jobs-checkout=6"], 3, 4, 4, 6), + (["--jobs=4", "--jobs-network=5", "--jobs-checkout=6"], 3, 4, 5, 6), + (["--jobs-network=5"], 3, 3, 5, 3), + (["--jobs-checkout=6"], 3, 3, 3, 6), + (["--jobs-network=5", "--jobs-checkout=6"], 3, 3, 5, 6), + # Settings that exceed rlimits get capped. + (["--jobs=1000000"], None, 83, 83, 83), + ([], 1000000, 83, 83, 83), + ], +) def test_cli_jobs(argv, jobs_manifest, jobs, jobs_net, jobs_check): - """Tests --jobs option behavior.""" - mp = mock.MagicMock() - mp.manifest.default.sync_j = jobs_manifest + """Tests --jobs option behavior.""" + mp = mock.MagicMock() + mp.manifest.default.sync_j = jobs_manifest - cmd = sync.Sync() - opts, args = cmd.OptionParser.parse_args(argv) - cmd.ValidateOptions(opts, args) + cmd = sync.Sync() + opts, args = cmd.OptionParser.parse_args(argv) + cmd.ValidateOptions(opts, args) - with mock.patch.object(sync, '_rlimit_nofile', return_value=(256, 256)): - with mock.patch.object(os, 'cpu_count', return_value=OS_CPU_COUNT): - cmd._ValidateOptionsWithManifest(opts, mp) - assert opts.jobs == jobs - assert opts.jobs_network == jobs_net - assert opts.jobs_checkout == jobs_check + with mock.patch.object(sync, "_rlimit_nofile", return_value=(256, 256)): + with mock.patch.object(os, "cpu_count", return_value=OS_CPU_COUNT): + cmd._ValidateOptionsWithManifest(opts, mp) + assert opts.jobs == jobs + assert opts.jobs_network == jobs_net + assert opts.jobs_checkout == jobs_check class GetPreciousObjectsState(unittest.TestCase): - """Tests for _GetPreciousObjectsState.""" - - def setUp(self): - """Common setup.""" - self.cmd = sync.Sync() - self.project = p = mock.MagicMock(use_git_worktrees=False, - UseAlternates=False) - p.manifest.GetProjectsWithName.return_value = [p] - - self.opt = mock.Mock(spec_set=['this_manifest_only']) - self.opt.this_manifest_only = False - - def test_worktrees(self): - """False for worktrees.""" - self.project.use_git_worktrees = True - self.assertFalse(self.cmd._GetPreciousObjectsState(self.project, self.opt)) - - def test_not_shared(self): - """Singleton project.""" - self.assertFalse(self.cmd._GetPreciousObjectsState(self.project, self.opt)) - - def test_shared(self): - """Shared project.""" - self.project.manifest.GetProjectsWithName.return_value = [ - self.project, self.project - ] - self.assertTrue(self.cmd._GetPreciousObjectsState(self.project, self.opt)) - - def test_shared_with_alternates(self): - """Shared project, with alternates.""" - self.project.manifest.GetProjectsWithName.return_value = [ - self.project, self.project - ] - self.project.UseAlternates = True - self.assertFalse(self.cmd._GetPreciousObjectsState(self.project, self.opt)) - - def test_not_found(self): - """Project not found in manifest.""" - self.project.manifest.GetProjectsWithName.return_value = [] - self.assertFalse(self.cmd._GetPreciousObjectsState(self.project, self.opt)) + """Tests for _GetPreciousObjectsState.""" + + def setUp(self): + """Common setup.""" + self.cmd = sync.Sync() + self.project = p = mock.MagicMock( + use_git_worktrees=False, UseAlternates=False + ) + p.manifest.GetProjectsWithName.return_value = [p] + + self.opt = mock.Mock(spec_set=["this_manifest_only"]) + self.opt.this_manifest_only = False + + def test_worktrees(self): + """False for worktrees.""" + self.project.use_git_worktrees = True + self.assertFalse( + self.cmd._GetPreciousObjectsState(self.project, self.opt) + ) + + def test_not_shared(self): + """Singleton project.""" + self.assertFalse( + self.cmd._GetPreciousObjectsState(self.project, self.opt) + ) + + def test_shared(self): + """Shared project.""" + self.project.manifest.GetProjectsWithName.return_value = [ + self.project, + self.project, + ] + self.assertTrue( + self.cmd._GetPreciousObjectsState(self.project, self.opt) + ) + + def test_shared_with_alternates(self): + """Shared project, with alternates.""" + self.project.manifest.GetProjectsWithName.return_value = [ + self.project, + self.project, + ] + self.project.UseAlternates = True + self.assertFalse( + self.cmd._GetPreciousObjectsState(self.project, self.opt) + ) + + def test_not_found(self): + """Project not found in manifest.""" + self.project.manifest.GetProjectsWithName.return_value = [] + self.assertFalse( + self.cmd._GetPreciousObjectsState(self.project, self.opt) + ) -- cgit v1.2.3-54-g00ecf