From 05e02a94cd379e4096d5d149dd8b8e1b85347504 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 17 Apr 2018 13:21:49 +0000 Subject: [PATCH] Add zaza to generated model name --- unit_tests/test_zaza_charm_lifecycle_func_test_runner.py | 4 ++++ zaza/charm_lifecycle/func_test_runner.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 5786900..35081ef 100644 --- a/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py +++ b/unit_tests/test_zaza_charm_lifecycle_func_test_runner.py @@ -6,6 +6,10 @@ import unit_tests.utils as ut_utils class TestCharmLifecycleFuncTestRunner(ut_utils.BaseTestCase): + def test_generate_model_name(self): + mname = lc_func_test_runner.generate_model_name('mycharm', 'bundle') + self.assertTrue(mname.startswith('zaza-mycharmbundle')) + def test_parser(self): # Test defaults args = lc_func_test_runner.parse_args([]) diff --git a/zaza/charm_lifecycle/func_test_runner.py b/zaza/charm_lifecycle/func_test_runner.py index d3fc2eb..811c315 100644 --- a/zaza/charm_lifecycle/func_test_runner.py +++ b/zaza/charm_lifecycle/func_test_runner.py @@ -15,7 +15,7 @@ import zaza.charm_lifecycle.test as test def generate_model_name(charm_name, bundle_name): timestamp = datetime.datetime.now().strftime('%Y%m%d%H%M%S') - return '{}{}{}'.format(charm_name, bundle_name, timestamp) + return 'zaza-{}{}{}'.format(charm_name, bundle_name, timestamp) def func_test_runner(keep_model=False, smoke=False):