Merge "Remove all references to /home/opnfv/repos/functest"

4 files changed, 35 insertions, 36 deletions

diff --git a/functest/tests/unit/cli/commands/test_cli_env.py b/functest/tests/unit/cli/commands/test_cli_env.py
index b4e98787..0b18554b 100644
--- a/functest/tests/unit/cli/commands/test_cli_env.py
+++ b/functest/tests/unit/cli/commands/test_cli_env.py
@@ -6,6 +6,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 import logging
+import pkg_resources
 import unittest
 
 import mock
@@ -24,8 +25,8 @@ class CliEnvTesting(unittest.TestCase):
                 return_value=False)
     @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
     def test_prepare_default(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/prepare_env.py start" %
-               CONST.__getattribute__('dir_repo_functest'))
+        cmd = ("python %s start" % pkg_resources.resource_filename(
+            'functest', 'ci/prepare_env.py'))
         self.cli_environ.prepare()
         mock_ft_utils.assert_called_with(cmd)
 
@@ -36,8 +37,8 @@ class CliEnvTesting(unittest.TestCase):
         with mock.patch('__builtin__.raw_input', return_value="y"), \
                 mock.patch('functest.cli.commands.cli_testcase.os.remove') \
                 as mock_os_remove:
-            cmd = ("python %s/functest/ci/prepare_env.py start" %
-                   CONST.__getattribute__('dir_repo_functest'))
+            cmd = ("python %s start" % pkg_resources.resource_filename(
+                'functest', 'ci/prepare_env.py'))
             self.cli_environ.prepare()
             mock_os_remove.assert_called_once_with(
                 CONST.__getattribute__('env_active'))
diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py
index c3285ecb..50ebe4b5 100644
--- a/functest/tests/unit/cli/commands/test_cli_os.py
+++ b/functest/tests/unit/cli/commands/test_cli_os.py
@@ -8,13 +8,13 @@
 #
 
 import logging
+import pkg_resources
 import unittest
 import os
 
 import mock
 
 from functest.cli.commands import cli_os
-from functest.utils.constants import CONST
 
 
 class CliOpenStackTesting(unittest.TestCase):
@@ -25,7 +25,6 @@ class CliOpenStackTesting(unittest.TestCase):
         self.installer_type = 'test_installer_type'
         self.installer_ip = 'test_installer_ip'
         self.openstack_creds = 'test_openstack_creds'
-        self.dir_repo_functest = 'test_dir_repo_functest'
         self.snapshot_file = 'test_snapshot_file'
         self.cli_os = cli_os.CliOpenStack()
 
@@ -64,11 +63,10 @@ class CliOpenStackTesting(unittest.TestCase):
     @mock.patch('functest.cli.commands.cli_os.ft_utils.execute_command')
     def test_check(self, mock_ftutils_execute):
         with mock.patch.object(self.cli_os, 'ping_endpoint'):
-            CONST.__setattr__('dir_repo_functest', self.dir_repo_functest)
-            cmd = os.path.join(CONST.__getattribute__('dir_repo_functest'),
-                               "functest/ci/check_os.sh")
             self.cli_os.check()
-            mock_ftutils_execute.assert_called_once_with(cmd, verbose=False)
+            mock_ftutils_execute.assert_called_once_with(
+                "sh %s" % pkg_resources.resource_filename(
+                    'functest', 'ci/check_os.sh'), verbose=False)
 
     @mock.patch('functest.cli.commands.cli_os.os.path.isfile',
                 return_value=False)
diff --git a/functest/tests/unit/cli/commands/test_cli_testcase.py b/functest/tests/unit/cli/commands/test_cli_testcase.py
index fddfc317..4d0bdc2f 100644
--- a/functest/tests/unit/cli/commands/test_cli_testcase.py
+++ b/functest/tests/unit/cli/commands/test_cli_testcase.py
@@ -7,12 +7,12 @@
 
 
 import logging
+import pkg_resources
 import unittest
 
 import mock
 
 from functest.cli.commands import cli_testcase
-from functest.utils.constants import CONST
 
 
 class CliTestCasesTesting(unittest.TestCase):
@@ -39,9 +39,9 @@ class CliTestCasesTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
     def test_run_default(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "-n -r ", self.testname))
         self.cli_tests.run(self.testname, noclean=True, report=True)
         mock_ft_utils.assert_called_with(cmd)
@@ -50,9 +50,9 @@ class CliTestCasesTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
     def test_run_noclean_missing_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "-n ", self.testname))
         self.cli_tests.run(self.testname, noclean=True, report=False)
         mock_ft_utils.assert_called_with(cmd)
@@ -61,9 +61,9 @@ class CliTestCasesTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
     def test_run_report_missing_noclean(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "-r ", self.testname))
         self.cli_tests.run(self.testname, noclean=False, report=True)
         mock_ft_utils.assert_called_with(cmd)
@@ -72,9 +72,9 @@ class CliTestCasesTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_testcase.ft_utils.execute_command')
     def test_run_missing_noclean_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "", self.testname))
         self.cli_tests.run(self.testname, noclean=False, report=False)
         mock_ft_utils.assert_called_with(cmd)
diff --git a/functest/tests/unit/cli/commands/test_cli_tier.py b/functest/tests/unit/cli/commands/test_cli_tier.py
index 550eec93..b42e3581 100644
--- a/functest/tests/unit/cli/commands/test_cli_tier.py
+++ b/functest/tests/unit/cli/commands/test_cli_tier.py
@@ -7,12 +7,12 @@
 
 
 import logging
+import pkg_resources
 import unittest
 
 import mock
 
 from functest.cli.commands import cli_tier
-from functest.utils.constants import CONST
 
 
 class CliTierTesting(unittest.TestCase):
@@ -87,9 +87,9 @@ class CliTierTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
     def test_run_default(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "-n -r ", self.tiername))
         self.cli_tier.run(self.tiername, noclean=True, report=True)
         mock_ft_utils.assert_called_with(cmd)
@@ -98,9 +98,9 @@ class CliTierTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
     def test_run_report_missing_noclean(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "-r ", self.tiername))
         self.cli_tier.run(self.tiername, noclean=False, report=True)
         mock_ft_utils.assert_called_with(cmd)
@@ -109,9 +109,9 @@ class CliTierTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
     def test_run_noclean_missing_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "-n ", self.tiername))
         self.cli_tier.run(self.tiername, noclean=True, report=False)
         mock_ft_utils.assert_called_with(cmd)
@@ -120,9 +120,9 @@ class CliTierTesting(unittest.TestCase):
                 return_value=True)
     @mock.patch('functest.cli.commands.cli_tier.ft_utils.execute_command')
     def test_run_missing_noclean_report(self, mock_ft_utils, mock_os):
-        cmd = ("python %s/functest/ci/run_tests.py "
-               "%s -t %s" %
-               (CONST.__getattribute__('dir_repo_functest'),
+        cmd = ("python %s %s -t %s" %
+               (pkg_resources.resource_filename(
+                   'functest', 'ci/run_tests.py'),
                 "", self.tiername))
         self.cli_tier.run(self.tiername, noclean=False, report=False)
         mock_ft_utils.assert_called_with(cmd)