Enable PYTHONPATH env variable inside the container

[functest.git] / testcases / tests / TestFunctestUtils.py

diff --git a/testcases/tests/TestFunctestUtils.py b/testcases/tests/TestFunctestUtils.py
index 337e4ee..e1f81ec 100644 (file)
--- a/testcases/tests/TestFunctestUtils.py
+++ b/testcases/tests/TestFunctestUtils.py
@@ -1,9 +1,8 @@
-import unittest
+#!/usr/bin/python
+
 import os
-import sys
+import unittest
 import yaml
-
-sys.path.append("../")
 from functest_utils import getTestEnv, isTestRunnable, generateTestcaseList
 
 
@@ -11,8 +10,7 @@ class TestFunctestUtils(unittest.TestCase):
 
     def setUp(self):
         os.environ["INSTALLER_TYPE"] = "fuel"
-        os.environ["SDN_CONTROLLER"] = "odl"
-        os.environ["OPNFV_FEATURE"] = "ovs2.4"
+        os.environ["DEPLOY_SCENARIO"] = "os-odl_l3-ovs-ha"
 
         global functest_yaml
 
@@ -23,13 +21,13 @@ class TestFunctestUtils(unittest.TestCase):
     def test_getTestEnv(self):
 
         env_test = getTestEnv('ovno', functest_yaml)
-        self.assertEqual(env_test, {'controller': 'opencontrail'})
+        self.assertEqual(env_test, {'scenario': 'ocl'})
 
         env_test = getTestEnv('doctor', functest_yaml)
-        self.assertEqual(env_test, None)
+        self.assertEqual(env_test, {'installer': 'fuel'})
 
         env_test = getTestEnv('promise', functest_yaml)
-        self.assertEqual(env_test, None)
+        self.assertEqual(env_test, {'installer': '(fuel)|(joid)'})
 
         env_test = getTestEnv('functest/tempest', functest_yaml)
         self.assertEqual(env_test, None)
@@ -38,30 +36,13 @@ class TestFunctestUtils(unittest.TestCase):
         self.assertEqual(env_test, None)
 
         env_test = getTestEnv('functest/odl', functest_yaml)
-        self.assertEqual(env_test, {'controller': 'odl'})
+        self.assertEqual(env_test, {'scenario': 'odl'})
 
         env_test = getTestEnv('functest/onos', functest_yaml)
-        self.assertEqual(env_test, {'controller': 'onos'})
-
-        env_test = getTestEnv('functest/onos-ovsdb', functest_yaml)
-        self.assertEqual(env_test, {'controller': 'onos'})
+        self.assertEqual(env_test, {'scenario': 'onos'})
 
         env_test = getTestEnv('policy-test', functest_yaml)
-        self.assertEqual(env_test, {'controller': 'odl'})
-
-        env_test = getTestEnv('sdnvpn/odl-vpn_service-tests', functest_yaml)
-        self.assertEqual(env_test,
-                         {'controller': 'odl', 'scenario': 'os_ovh_ha'})
-
-        env_test = getTestEnv('sdnvpn/opnfv-yardstick-tc026-sdnvpn',
-                              functest_yaml)
-        self.assertEqual(env_test,
-                         {'controller': 'nosdn', 'scenario': 'os_ovh_ha'})
-
-        env_test = getTestEnv('sdnvpn/openstack-neutron-bgpvpn-api-extension-tests',
-                              functest_yaml)
-        self.assertEqual(env_test,
-                         {'controller': 'nosdn', 'scenario': 'os_ovh_ha'})
+        self.assertEqual(env_test, {'scenario': 'odl'})
 
         env_test = getTestEnv('foo', functest_yaml)
         self.assertEqual(env_test, '')
@@ -83,7 +64,10 @@ class TestFunctestUtils(unittest.TestCase):
         test = isTestRunnable('functest/odl', functest_yaml)
         self.assertTrue(test)
 
-        test = isTestRunnable('functest/vping', functest_yaml)
+        test = isTestRunnable('functest/vping_ssh', functest_yaml)
+        self.assertTrue(test)
+
+        test = isTestRunnable('functest/vping_userdata', functest_yaml)
         self.assertTrue(test)
 
         test = isTestRunnable('functest/tempest', functest_yaml)
@@ -95,27 +79,17 @@ class TestFunctestUtils(unittest.TestCase):
         test = isTestRunnable('functest/vims', functest_yaml)
         self.assertTrue(test)
 
-        test = isTestRunnable('sdnvpn/odl-vpn_service-tests',
-                              functest_yaml)
-        self.assertTrue(test)
-
-        test = isTestRunnable('sdnvpn/opnfv-yardstick-tc026-sdnvpn',
-                              functest_yaml)
-        self.assertFalse(test)
-
     def test_generateTestcaseList(self):
 
         test = generateTestcaseList(functest_yaml)
-        test = sorted(test.split(' '))
-        expected_list = "doctor vims odl rally vping tempest promise policy-test odl-vpn_service-tests "
-        expected_list_array = sorted(expected_list.split(' '))
-        
-        self.assertEqual(test, expected_list_array)
+
+        expected_list = "vping_ssh vping_userdata tempest odl doctor " + \
+            "promise policy-test odl-vpn_service-tests vims rally "
+        self.assertEqual(test, expected_list)
 
     def tearDown(self):
         os.environ["INSTALLER_TYPE"] = ""
-        os.environ["SDN_CONTROLLER"] = ""
-        os.environ["OPNFV_FEATURE"] = ""
+        os.environ["DEPLOY_SCENARIO"] = ""
 
 
 if __name__ == '__main__':