From 247535739882f7d9c99b89f349e7fc080d789025 Mon Sep 17 00:00:00 2001
From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Tue, 28 Aug 2018 14:49:24 +0300
Subject: Remove installer type from rally blacklist

Enables utilization of blacklist also on non-OPNFV environments since
there is no link to installer type.

JIRA: FUNCTEST-1008

Change-Id: I3eb4377af153480794c1a71c5d7ef3e78dacacb9
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
---
 functest/tests/unit/openstack/rally/test_rally.py | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'functest/tests/unit')

diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py
index b1dee91cb..401f043aa 100644
--- a/functest/tests/unit/openstack/rally/test_rally.py
+++ b/functest/tests/unit/openstack/rally/test_rally.py
@@ -111,10 +111,8 @@ class OSRallyTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
                 return_value={'scenario': [
                     {'scenarios': ['test_scenario'],
-                     'installers': ['test_installer'],
                      'tests': ['test']},
                     {'scenarios': ['other_scenario'],
-                     'installers': ['test_installer'],
                      'tests': ['other_test']}]})
     def test_excl_scenario_default(self, mock_func):
         os.environ['INSTALLER_TYPE'] = 'test_installer'
@@ -126,25 +124,18 @@ class OSRallyTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
                 return_value={'scenario': [
                     {'scenarios': ['^os-[^-]+-featT-modeT$'],
-                     'installers': ['test_installer'],
                      'tests': ['test1']},
                     {'scenarios': ['^os-ctrlT-[^-]+-modeT$'],
-                     'installers': ['test_installer'],
                      'tests': ['test2']},
                     {'scenarios': ['^os-ctrlT-featT-[^-]+$'],
-                     'installers': ['test_installer'],
                      'tests': ['test3']},
                     {'scenarios': ['^os-'],
-                     'installers': ['test_installer'],
                      'tests': ['test4']},
                     {'scenarios': ['other_scenario'],
-                     'installers': ['test_installer'],
                      'tests': ['test0a']},
                     {'scenarios': [''],  # empty scenario
-                     'installers': ['test_installer'],
                      'tests': ['test0b']}]})
     def test_excl_scenario_regex(self, mock_func):
-        os.environ['INSTALLER_TYPE'] = 'test_installer'
         os.environ['DEPLOY_SCENARIO'] = 'os-ctrlT-featT-modeT'
         self.assertEqual(self.rally_base.excl_scenario(),
                          ['test1', 'test2', 'test3', 'test4'])
@@ -162,7 +153,6 @@ class OSRallyTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
                 '_migration_supported', return_value=False)
     def test_excl_func_default(self, mock_func, mock_yaml_load):
-        os.environ['INSTALLER_TYPE'] = 'test_installer'
         os.environ['DEPLOY_SCENARIO'] = 'test_scenario'
         self.assertEqual(self.rally_base.excl_func(), ['test'])
         mock_func.assert_called()
-- 
cgit 1.2.3-korg