From 3cc6832389c3ea39074a625fa66e4b3b64287c0c Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Tue, 27 Nov 2018 10:32:58 +0100 Subject: [PATCH] Pass pylint test with networking scenario tests. - remove parameters from setUp method - take test name from id() test case method - always use default template parameters - create_stack method doesn't takes any parameter Change-Id: I2d606c2329eae1d5b4c8eceb330feafb0d2af815 --- tobiko/tests/scenario/base.py | 30 ++++++++++++------- tobiko/tests/scenario/test_continuous_ping.py | 2 +- tobiko/tests/scenario/test_floatingip.py | 2 +- tobiko/tests/scenario/test_mtu.py | 2 +- tobiko/tests/scenario/test_security_groups.py | 2 +- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/tobiko/tests/scenario/base.py b/tobiko/tests/scenario/base.py index 855a67785..71cdabe49 100644 --- a/tobiko/tests/scenario/base.py +++ b/tobiko/tests/scenario/base.py @@ -15,10 +15,10 @@ from __future__ import absolute_import import os +import sys from heatclient import exc - from tobiko.tests import base from tobiko.common.managers import stack from tobiko.common.managers import network @@ -28,20 +28,30 @@ from tobiko.common import constants class ScenarioTestsBase(base.TobikoTest): """All scenario tests inherit from this scenario base class.""" - def setUp(self, file_path, params=None): + def setUp(self): super(ScenarioTestsBase, self).setUp() templates_dir = os.path.join(os.path.dirname(__file__), 'templates') self.stackManager = stack.StackManager(self.clientManager, templates_dir) self.networkManager = network.NetworkManager(self.clientManager) - self.params = params or self.default_params - file_name = os.path.basename(file_path) - self.stack_name = file_name.split(".py")[0] + self.params = self.default_params + + test_name = self.id() + while test_name: + test_module = sys.modules.get(test_name) + if test_module: + break + name_parts = test_name.rsplit('.', 1) + if len(name_parts) == 1: + msg = "Invalid test name: {!r}".format(self.id()) + raise RuntimeError(msg) + test_name = name_parts[0] + self.stack_name = test_name.rsplit('.', 1)[-1] try: self.stackManager.get_stack(self.stack_name) except exc.HTTPNotFound: - self.create_stack(self.stack_name) + self.create_stack() def create_stack(self): """Creates stack to be used by all scenario tests.""" @@ -57,7 +67,7 @@ class ScenarioTestsBase(base.TobikoTest): return st['stack'] def _get_stack(self): - stack = self.stackManager.get_stack(self.stack_name) - if not stack: - stack = self.create_stack() - return stack + _stack = self.stackManager.get_stack(self.stack_name) + if not _stack: + _stack = self.create_stack() + return _stack diff --git a/tobiko/tests/scenario/test_continuous_ping.py b/tobiko/tests/scenario/test_continuous_ping.py index 027876ca8..a2d84c198 100644 --- a/tobiko/tests/scenario/test_continuous_ping.py +++ b/tobiko/tests/scenario/test_continuous_ping.py @@ -27,7 +27,7 @@ class ContinuousPingTest(base.ScenarioTestsBase): MAX_PACKET_LOSS = 5 def setUp(self): - super(ContinuousPingTest, self).setUp(__file__) + super(ContinuousPingTest, self).setUp() self.stack = self._get_stack() self.fip = self.stackManager.get_output(self.stack, "fip") diff --git a/tobiko/tests/scenario/test_floatingip.py b/tobiko/tests/scenario/test_floatingip.py index e5008f467..86cb71691 100644 --- a/tobiko/tests/scenario/test_floatingip.py +++ b/tobiko/tests/scenario/test_floatingip.py @@ -22,7 +22,7 @@ class FloatingIPTest(base.ScenarioTestsBase): """Tests server connectivity""" def setUp(self): - super(FloatingIPTest, self).setUp(__file__) + super(FloatingIPTest, self).setUp() self.stack = self._get_stack() self.fip = self.stackManager.get_output(self.stack, "fip") self.unreachable_fip = self.stackManager.get_output(self.stack, "fip2") diff --git a/tobiko/tests/scenario/test_mtu.py b/tobiko/tests/scenario/test_mtu.py index 8ba1745db..eac570f68 100644 --- a/tobiko/tests/scenario/test_mtu.py +++ b/tobiko/tests/scenario/test_mtu.py @@ -27,7 +27,7 @@ class MTUTest(base.ScenarioTestsBase): """Tests MTU.""" def setUp(self): - super(MTUTest, self).setUp(__file__) + super(MTUTest, self).setUp() self.stack = self._get_stack() self.fip_max_mtu = self.stackManager.get_output( self.stack, "fip_max_mtu") diff --git a/tobiko/tests/scenario/test_security_groups.py b/tobiko/tests/scenario/test_security_groups.py index 66375defa..41a834aa4 100644 --- a/tobiko/tests/scenario/test_security_groups.py +++ b/tobiko/tests/scenario/test_security_groups.py @@ -22,7 +22,7 @@ class SecurityGroupTest(base.ScenarioTestsBase): """Tests security groups.""" def setUp(self): - super(SecurityGroupTest, self).setUp(__file__) + super(SecurityGroupTest, self).setUp() self.stack = self._get_stack() self.fip = self.stackManager.get_output(self.stack, "fip") self.unreachable_fip = self.stackManager.get_output(self.stack, "fip2")