diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-27 09:31:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-27 09:31:17 +0000 |
| commit | e50767cc62bbf42505d36b3932709db8a73e9d4b (patch) | |
| tree | 735596730af875963a934c80a5ae45c57505817b /functest/opnfv_tests | |
| parent | 6eeafcbb3f0abe63eca3c00dab7ed4adb4e2c34c (diff) | |
| parent | e98be297ea911c9185fc263cd325b558a0a20ea9 (diff) | |
Merge "Added unit tests for api_check, health_check, and smoke tests."
Diffstat (limited to 'functest/opnfv_tests')
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/api_check.py | 10 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/health_check.py | 10 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/smoke.py | 10 |
3 files changed, 27 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py index 50f67094..43518cb4 100644 --- a/functest/opnfv_tests/openstack/snaps/api_check.py +++ b/functest/opnfv_tests/openstack/snaps/api_check.py @@ -1,4 +1,5 @@ -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 Cable Television Laboratories, Inc. and others. +# # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -26,8 +27,15 @@ class ApiCheck(SnapsTestRunner): self.suite = unittest.TestSuite() + def run(self, **kwargs): + """ + Builds the test suite then calls super.run() + :param kwargs: the arguments to pass on + :return: + """ test_suite_builder.add_openstack_api_tests( suite=self.suite, os_creds=self.os_creds, ext_net_name=self.ext_net_name, use_keystone=self.use_keystone) + return super(self.__class__, self).run() diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py index 0daddcdd..4e94460c 100644 --- a/functest/opnfv_tests/openstack/snaps/health_check.py +++ b/functest/opnfv_tests/openstack/snaps/health_check.py @@ -1,4 +1,5 @@ -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 Cable Television Laboratories, Inc. and others. +# # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -28,6 +29,12 @@ class HealthCheck(SnapsTestRunner): self.suite = unittest.TestSuite() + def run(self, **kwargs): + """ + Builds the test suite then calls super.run() + :param kwargs: the arguments to pass on + :return: + """ image_custom_config = None if hasattr(CONST, 'snaps_images_cirros'): @@ -39,3 +46,4 @@ class HealthCheck(SnapsTestRunner): use_keystone=self.use_keystone, flavor_metadata=self.flavor_metadata, image_metadata=image_custom_config)) + return super(self.__class__, self).run() diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py index d9f95e90..c3c55c7c 100644 --- a/functest/opnfv_tests/openstack/snaps/smoke.py +++ b/functest/opnfv_tests/openstack/snaps/smoke.py @@ -1,4 +1,5 @@ -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 Cable Television Laboratories, Inc. and others. +# # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -28,6 +29,12 @@ class SnapsSmoke(SnapsTestRunner): self.suite = unittest.TestSuite() + def run(self, **kwargs): + """ + Builds the test suite then calls super.run() + :param kwargs: the arguments to pass on + :return: + """ image_config = None if hasattr(CONST, 'snaps_images_cirros'): image_config = CONST.__getattribute__('snaps_images_cirros') @@ -47,3 +54,4 @@ class SnapsSmoke(SnapsTestRunner): flavor_metadata=self.flavor_metadata, image_metadata=image_config, use_floating_ips=self.use_fip) + return super(self.__class__, self).run() |