From 1b838b4bd75f21e45e8a40407b1e3279dd5935d2 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 30 Jun 2017 09:13:17 +0200 Subject: Define download_images.sh and check_os.sh as scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- functest/tests/unit/cli/commands/test_cli_os.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'functest/tests/unit') 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) -- cgit 1.2.3-korg