From e98be297ea911c9185fc263cd325b558a0a20ea9 Mon Sep 17 00:00:00 2001 From: spisarski Date: Thu, 1 Jun 2017 08:04:24 -0600 Subject: Added unit tests for api_check, health_check, and smoke tests. In addition to the creation of the unit tests, this patch simplifies the mocks for connection check as there was an unused annotation. This patch also refactors the building of the test suite from the constructor to the run() method. JIRA: FUNCTEST-813 Change-Id: I7ff5d0389db36141a33ee3a8f76e04b922f8a95f Signed-off-by: spisarski --- functest/opnfv_tests/openstack/snaps/api_check.py | 10 +++++++++- functest/opnfv_tests/openstack/snaps/health_check.py | 10 +++++++++- functest/opnfv_tests/openstack/snaps/smoke.py | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) (limited to 'functest/opnfv_tests/openstack/snaps') diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py index 50f67094b..43518cb4e 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 0daddcdd2..4e94460c2 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 d9f95e90c..c3c55c7c3 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() -- cgit 1.2.3-korg