From a580a570b35f20a295f5c7e5b1fe09fdf6b73f20 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 15 May 2020 09:39:49 -0600 Subject: [PATCH] push test --- test/test_sys_checkout.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/test_sys_checkout.py b/test/test_sys_checkout.py index da0a6dcb6..532445281 100644 --- a/test/test_sys_checkout.py +++ b/test/test_sys_checkout.py @@ -819,10 +819,15 @@ def _check_container_component_post_checkout(self, overall, tree): def _check_container_component_post_checkout2(self, overall, tree): self.assertEqual(overall, 0) - self._check_simple_opt_ok(tree) self._check_simple_tag_empty(tree) self._check_simple_branch_ok(tree) + def _check_container_component_post_checkout3(self, overall, tree): + self.assertEqual(overall, 0) + self.assertFalse("simp_opt" in tree) + self._check_simple_tag_ok(tree) + self._check_simple_branch_ok(tree) + def _check_container_full_post_checkout(self, overall, tree): self.assertEqual(overall, 0) self._check_simple_tag_ok(tree) @@ -1348,7 +1353,7 @@ def test_container_component(self): self._check_container_component_post_checkout2(overall, tree) def test_container_exclude_component(self): - """Verify that optional component checkout works + """Verify that exclude component checkout works """ # create the test repository under_test_dir = self.setup_test_repo(CONTAINER_REPO_NAME) @@ -1357,12 +1362,13 @@ def test_container_exclude_component(self): self._generator.container_full(under_test_dir) # inital checkout, first try a nonexistant component argument noref - checkout_args = ['--exclude simp_opt'] + checkout_args = ['--exclude','simp_opt'] checkout_args.extend(self.checkout_args) - + save_checkout_args = self.checkout_args + self.checkout_args = checkout_args overall, tree = self.execute_cmd_in_dir(under_test_dir, checkout_args) - - self._check_container_component_post_checkout2(overall, tree) + self._check_container_component_post_checkout3(overall, tree) + self.checkout_args = save_checkout_args def test_mixed_simple(self): """Verify that a mixed use repo can serve as a 'full' container,