summaryrefslogtreecommitdiffstats
path: root/functest/tests
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-06-30 09:13:17 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-06-30 14:33:03 +0200
commit1b838b4bd75f21e45e8a40407b1e3279dd5935d2 (patch)
tree86046239cf5057b987d9b76ab70c14df60a60888 /functest/tests
parent678609610f4ccbcb19438cbce5d84bd376010596 (diff)
Define download_images.sh and check_os.sh as scripts
It also updates all python scripts which call check_os.sh. The former healthcheck.sh is removed. No shell script must be executable in git. Change-Id: If4e8deb50ebd635a9091e3bb79ef61c07b9660dc Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/tests')
-rw-r--r--functest/tests/unit/cli/commands/test_cli_os.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py
index 50ebe4b5..a3d930de 100644
--- a/functest/tests/unit/cli/commands/test_cli_os.py
+++ b/functest/tests/unit/cli/commands/test_cli_os.py
@@ -8,7 +8,6 @@
#
import logging
-import pkg_resources
import unittest
import os
@@ -65,8 +64,7 @@ class CliOpenStackTesting(unittest.TestCase):
with mock.patch.object(self.cli_os, 'ping_endpoint'):
self.cli_os.check()
mock_ftutils_execute.assert_called_once_with(
- "sh %s" % pkg_resources.resource_filename(
- 'functest', 'ci/check_os.sh'), verbose=False)
+ "check_os.sh", verbose=False)
@mock.patch('functest.cli.commands.cli_os.os.path.isfile',
return_value=False)