diff options
19 files changed, 30 insertions, 30 deletions
diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py index 8432bda4f..6207f5814 100644 --- a/functest/opnfv_tests/features/barometer.py +++ b/functest/opnfv_tests/features/barometer.py @@ -16,9 +16,9 @@ class BarometerCollectd(base.Feature): Class for executing barometercollectd testcase. ''' - def __init__(self): + def __init__(self, case_name='barometercollectd'): super(BarometerCollectd, self).__init__(project='barometer', - case_name='barometercollectd', + case_name=case_name, repo='dir_repo_barometer') def execute(self): diff --git a/functest/opnfv_tests/features/copper.py b/functest/opnfv_tests/features/copper.py index 6ed5e0ce0..5b88a4995 100644 --- a/functest/opnfv_tests/features/copper.py +++ b/functest/opnfv_tests/features/copper.py @@ -18,8 +18,8 @@ import functest.core.feature as base class Copper(base.Feature): - def __init__(self): + def __init__(self, case_name='copper-notification'): super(Copper, self).__init__(project='copper', - case_name='copper-notification', + case_name=case_name, repo='dir_repo_copper') self.cmd = 'cd %s/tests && bash run.sh && cd -' % self.repo diff --git a/functest/opnfv_tests/features/doctor.py b/functest/opnfv_tests/features/doctor.py index e35eadeef..fd181a040 100644 --- a/functest/opnfv_tests/features/doctor.py +++ b/functest/opnfv_tests/features/doctor.py @@ -17,8 +17,8 @@ import functest.core.feature as base class Doctor(base.Feature): - def __init__(self): + def __init__(self, case_name='doctor-notification'): super(Doctor, self).__init__(project='doctor', - case_name='doctor-notification', + case_name=case_name, repo='dir_repo_doctor') self.cmd = 'cd %s/tests && ./run.sh' % self.repo diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py index cf5f23d17..1c620235c 100644 --- a/functest/opnfv_tests/features/domino.py +++ b/functest/opnfv_tests/features/domino.py @@ -18,8 +18,8 @@ import functest.core.feature as base class Domino(base.Feature): - def __init__(self): + def __init__(self, case_name='domino-multinode'): super(Domino, self).__init__(project='domino', - case_name='domino-multinode', + case_name=case_name, repo='dir_repo_domino') self.cmd = 'cd %s && ./tests/run_multinode.sh' % self.repo diff --git a/functest/opnfv_tests/features/netready.py b/functest/opnfv_tests/features/netready.py index 7648a9b38..ada322c18 100644 --- a/functest/opnfv_tests/features/netready.py +++ b/functest/opnfv_tests/features/netready.py @@ -13,9 +13,9 @@ import functest.core.feature as base class GluonVping(base.Feature): - def __init__(self): + def __init__(self, case_name='gluon_vping'): super(GluonVping, self).__init__(project='netready', - case_name='gluon_vping', + case_name=case_name, repo='dir_repo_netready') dir_netready_functest = '{}/test/functest'.format(self.repo) self.cmd = ('cd %s && python ./gluon-test-suite.py' % diff --git a/functest/opnfv_tests/features/odl_sfc.py b/functest/opnfv_tests/features/odl_sfc.py index d3947e373..f96683e36 100644 --- a/functest/opnfv_tests/features/odl_sfc.py +++ b/functest/opnfv_tests/features/odl_sfc.py @@ -12,9 +12,9 @@ import functest.core.feature as base class OpenDaylightSFC(base.Feature): - def __init__(self): + def __init__(self, case_name='functest-odl-sfc'): super(OpenDaylightSFC, self).__init__(project='sfc', - case_name='functest-odl-sfc', + case_name=case_name, repo='dir_repo_sfc') dir_sfc_functest = '{}/sfc/tests/functest'.format(self.repo) self.cmd = 'cd %s && python ./run_tests.py' % dir_sfc_functest diff --git a/functest/opnfv_tests/features/promise.py b/functest/opnfv_tests/features/promise.py index b76a1910d..e3dc7fdf5 100644 --- a/functest/opnfv_tests/features/promise.py +++ b/functest/opnfv_tests/features/promise.py @@ -16,9 +16,9 @@ import functest.core.feature as base class Promise(base.Feature): - def __init__(self): + def __init__(self, case_name='promise'): super(Promise, self).__init__(project='promise', - case_name='promise', + case_name=case_name, repo='dir_repo_promise') dir_promise_functest = '{}/promise/test/functest'.format(self.repo) self.cmd = 'cd %s && python ./run_tests.py' % dir_promise_functest diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py index ea31f20af..5e9254a0b 100644 --- a/functest/opnfv_tests/features/sdnvpn.py +++ b/functest/opnfv_tests/features/sdnvpn.py @@ -12,9 +12,9 @@ import functest.core.feature as base class SdnVpnTests(base.Feature): - def __init__(self): + def __init__(self, case_name='bgpvpn'): super(SdnVpnTests, self).__init__(project='sdnvpn', - case_name='bgpvpn', + case_name=case_name, repo='dir_repo_sdnvpn') dir_sfc_functest = '{}/sdnvpn/test/functest'.format(self.repo) self.cmd = 'cd %s && python ./run_tests.py' % dir_sfc_functest diff --git a/functest/opnfv_tests/features/security_scan.py b/functest/opnfv_tests/features/security_scan.py index 3cde9d312..e72563808 100644 --- a/functest/opnfv_tests/features/security_scan.py +++ b/functest/opnfv_tests/features/security_scan.py @@ -13,9 +13,9 @@ from functest.utils.constants import CONST class SecurityScan(base.Feature): - def __init__(self): + def __init__(self, case_name='security_scan'): super(SecurityScan, self).__init__(project='securityscanning', - case_name='security_scan', + case_name=case_name, repo='dir_repo_securityscan') self.cmd = ('. {0}/stackrc && ' 'cd {1} && ' diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py index 45fa6de86..63d5c1223 100644 --- a/functest/opnfv_tests/openstack/snaps/smoke.py +++ b/functest/opnfv_tests/openstack/snaps/smoke.py @@ -21,11 +21,10 @@ class SnapsSmoke(SnapsTestRunner): that exercise many of the OpenStack APIs within Keystone, Glance, Neutron, and Nova """ - def __init__(self): - super(SnapsSmoke, self).__init__() + def __init__(self, case_name="snaps_smoke"): + super(SnapsSmoke, self).__init__(case_name) self.suite = unittest.TestSuite() - self.case_name = "snaps_smoke" use_fip = CONST.snaps_use_floating_ips # The snaps smoke test uses the same config as the diff --git a/functest/tests/unit/features/test_barometer.py b/functest/tests/unit/features/test_barometer.py index 6c68019dc..62f2e0d6e 100644 --- a/functest/tests/unit/features/test_barometer.py +++ b/functest/tests/unit/features/test_barometer.py @@ -27,7 +27,8 @@ class BarometerTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.barometer = barometer.BarometerCollectd() + self.barometer = barometer.BarometerCollectd( + case_name="barometercollectd") def test_init(self): self.assertEqual(self.barometer.project_name, "barometer") diff --git a/functest/tests/unit/features/test_copper.py b/functest/tests/unit/features/test_copper.py index 193ad6c95..b6d187f7a 100644 --- a/functest/tests/unit/features/test_copper.py +++ b/functest/tests/unit/features/test_copper.py @@ -21,7 +21,7 @@ class CopperTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.copper = copper.Copper() + self.copper = copper.Copper(case_name="copper-notification") def test_init(self): self.assertEqual(self.copper.project_name, "copper") diff --git a/functest/tests/unit/features/test_doctor.py b/functest/tests/unit/features/test_doctor.py index f37a89e1b..36bac44f0 100644 --- a/functest/tests/unit/features/test_doctor.py +++ b/functest/tests/unit/features/test_doctor.py @@ -21,7 +21,7 @@ class DoctorTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.doctor = doctor.Doctor() + self.doctor = doctor.Doctor(case_name="doctor-notification") def test_init(self): self.assertEqual(self.doctor.project_name, "doctor") diff --git a/functest/tests/unit/features/test_domino.py b/functest/tests/unit/features/test_domino.py index fe08bbabe..c0bfd14b4 100644 --- a/functest/tests/unit/features/test_domino.py +++ b/functest/tests/unit/features/test_domino.py @@ -21,7 +21,7 @@ class DominoTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.domino = domino.Domino() + self.domino = domino.Domino(case_name="domino-multinode") def test_init(self): self.assertEqual(self.domino.project_name, "domino") diff --git a/functest/tests/unit/features/test_netready.py b/functest/tests/unit/features/test_netready.py index 7d78e13e7..47be42034 100644 --- a/functest/tests/unit/features/test_netready.py +++ b/functest/tests/unit/features/test_netready.py @@ -21,7 +21,7 @@ class NetreadyTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.netready = netready.GluonVping() + self.netready = netready.GluonVping(case_name="gluon_vping") def test_init(self): self.assertEqual(self.netready.project_name, "netready") diff --git a/functest/tests/unit/features/test_odl_sfc.py b/functest/tests/unit/features/test_odl_sfc.py index da592de11..dcdcdff63 100644 --- a/functest/tests/unit/features/test_odl_sfc.py +++ b/functest/tests/unit/features/test_odl_sfc.py @@ -21,7 +21,7 @@ class OpenDaylightSFCTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.odl_sfc = odl_sfc.OpenDaylightSFC() + self.odl_sfc = odl_sfc.OpenDaylightSFC(case_name="functest-odl-sfc") def test_init(self): self.assertEqual(self.odl_sfc.project_name, "sfc") diff --git a/functest/tests/unit/features/test_promise.py b/functest/tests/unit/features/test_promise.py index e22196cb3..29b4d4ec8 100644 --- a/functest/tests/unit/features/test_promise.py +++ b/functest/tests/unit/features/test_promise.py @@ -21,7 +21,7 @@ class PromiseTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.promise = promise.Promise() + self.promise = promise.Promise(case_name="promise") def test_init(self): self.assertEqual(self.promise.project_name, "promise") diff --git a/functest/tests/unit/features/test_sdnvpn.py b/functest/tests/unit/features/test_sdnvpn.py index 7dcf7cc8f..8fa43fc44 100644 --- a/functest/tests/unit/features/test_sdnvpn.py +++ b/functest/tests/unit/features/test_sdnvpn.py @@ -21,7 +21,7 @@ class SdnVpnTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.sdnvpn = sdnvpn.SdnVpnTests() + self.sdnvpn = sdnvpn.SdnVpnTests(case_name="bgpvpn") def test_init(self): self.assertEqual(self.sdnvpn.project_name, "sdnvpn") diff --git a/functest/tests/unit/features/test_security_scan.py b/functest/tests/unit/features/test_security_scan.py index 8e814992b..f0e40159d 100644 --- a/functest/tests/unit/features/test_security_scan.py +++ b/functest/tests/unit/features/test_security_scan.py @@ -21,7 +21,7 @@ class SecurityScanTesting(unittest.TestCase): logging.disable(logging.CRITICAL) def setUp(self): - self.sscan = security_scan.SecurityScan() + self.sscan = security_scan.SecurityScan(case_name="security_scan") def test_init(self): self.assertEqual(self.sscan.project_name, "securityscanning") |