openstack
/
fuel-qa
Code Issues Proposed changes

Refactor usage of template for detach-haproxy tests 

In case SEPARATE_SERVICE_HAPROXY_PLUGIN_PATH is set without
MULTIPLE_NETWORKS we got local variable 'load_yaml' referenced before assignment
Since this variable is added for all plugin tests it breaks them

Partial-bug: 1589914
Change-Id: I8e2dc6f6074db6c3d45d73a102b5d9f9e9671f25
This commit is contained in:
Volodymyr Shypyguzov 2016-06-07 13:04:43 +03:00 committed by Vladimir Khlyunev
parent b4ba7a3af1
commit 609b7d071b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelweb_test/settings.py
View File

@ -132,6 +132,8 @@ MULTIPLE_NETWORKS_TEMPLATE = os.environ.get(
'MULTIPLE_NETWORKS_TEMPLATE',
os.path.join(os.getcwd(),
'system_test/tests_templates/tests_configs/multirack.yaml'))
USE_HAPROXY_TEMPLATE = get_var_as_bool("USE_HAPROXY_TEMPLATE", False)
EXTERNAL_HAPROXY_TEMPLATE = os.environ.get(
'EXTERNAL_HAPROXY_TEMPLATE',
os.path.join(os.getcwd(),

4
fuelweb_test/tests/base_test_case.py
View File

@ -33,6 +33,7 @@ from fuelweb_test.settings import MULTIPLE_NETWORKS_TEMPLATE
from fuelweb_test.settings import REPLACE_DEFAULT_REPOS
from fuelweb_test.settings import REPLACE_DEFAULT_REPOS_ONLY_ONCE
from fuelweb_test.settings import SEPARATE_SERVICE_HAPROXY_PLUGIN_PATH
from fuelweb_test.settings import USE_HAPROXY_TEMPLATE
from gates_tests.helpers import exceptions
@ -347,7 +348,8 @@ class SetupEnvironment(TestBasic):
if MULTIPLE_NETWORKS:
from system_test.core.discover import load_yaml
self._devops_config = load_yaml(MULTIPLE_NETWORKS_TEMPLATE)
if SEPARATE_SERVICE_HAPROXY_PLUGIN_PATH:
if USE_HAPROXY_TEMPLATE and SEPARATE_SERVICE_HAPROXY_PLUGIN_PATH:
from system_test.core.discover import load_yaml
self._devops_config = load_yaml(EXTERNAL_HAPROXY_TEMPLATE)
self.check_run("empty")