diff --git a/unit_tests/test_zaza_charm_lifecycle_configure.py b/unit_tests/test_zaza_charm_lifecycle_configure.py index 8a9bf9c..10b3808 100644 --- a/unit_tests/test_zaza_charm_lifecycle_configure.py +++ b/unit_tests/test_zaza_charm_lifecycle_configure.py @@ -19,9 +19,11 @@ class TestCharmLifecycleConfigure(ut_utils.BaseTestCase): self.patch_object(lc_configure, 'run_configure_list') mock1 = mock.MagicMock() mock2 = mock.MagicMock() - lc_configure.configure([mock1, mock2]) + lc_configure.configure('modelname', [mock1, mock2]) self.run_configure_list.assert_called_once_with([mock1, mock2]) def test_parser(self): - args = lc_configure.parse_args(['-c', 'my.func1', 'my.func2']) + args = lc_configure.parse_args( + ['-m', 'modelname', '-c', 'my.func1', 'my.func2']) self.assertEqual(args.configfuncs, ['my.func1', 'my.func2']) + self.assertEqual(args.model_name, 'modelname') diff --git a/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py b/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py index f21a645..cf6a29a 100644 --- a/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py +++ b/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py @@ -32,17 +32,17 @@ class TestCharmLifecycleFuncTestRunner(ut_utils.BaseTestCase): mock.call('./tests/bundles/bundle1.yaml', 'newmodel'), mock.call('./tests/bundles/bundle2.yaml', 'newmodel')] configure_calls = [ - mock.call([ + mock.call('newmodel', [ 'zaza.charm_tests.mycharm.setup.basic_setup' 'zaza.charm_tests.othercharm.setup.setup']), - mock.call([ + mock.call('newmodel', [ 'zaza.charm_tests.mycharm.setup.basic_setup' 'zaza.charm_tests.othercharm.setup.setup'])] test_calls = [ - mock.call([ + mock.call('newmodel', [ 'zaza.charm_tests.mycharm.tests.SmokeTest', 'zaza.charm_tests.mycharm.tests.ComplexTest']), - mock.call([ + mock.call('newmodel', [ 'zaza.charm_tests.mycharm.tests.SmokeTest', 'zaza.charm_tests.mycharm.tests.ComplexTest'])] destroy_calls = [ diff --git a/unit_tests/test_zaza_charm_lifecycle_test.py b/unit_tests/test_zaza_charm_lifecycle_test.py index 8070602..220166c 100644 --- a/unit_tests/test_zaza_charm_lifecycle_test.py +++ b/unit_tests/test_zaza_charm_lifecycle_test.py @@ -30,7 +30,9 @@ class TestCharmLifecycleTest(ut_utils.BaseTestCase): ['test_class1', 'test_class2']) def test_parser(self): - args = lc_test.parse_args(['-t', 'my.test_class1', 'my.test_class2']) + args = lc_test.parse_args( + ['-m', 'modelname', '-t', 'my.test_class1', 'my.test_class2']) self.assertEqual( args.tests, ['my.test_class1', 'my.test_class2']) + self.assertEqual(args.model_name, 'modelname')