From 2300c2e0d61ad6a241e82ffbcfcb72822f1f70ee Mon Sep 17 00:00:00 2001 From: Jesse Jaggars Date: Tue, 20 Mar 2012 13:37:34 -0500 Subject: using /usr/bin/timeout if it's there --- tests/utilities_tests.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/utilities_tests.py') diff --git a/tests/utilities_tests.py b/tests/utilities_tests.py index 24bc950b..fd9699fe 100644 --- a/tests/utilities_tests.py +++ b/tests/utilities_tests.py @@ -2,7 +2,7 @@ import os.path import unittest from StringIO import StringIO -from sos.utilities import grep, DirTree, checksum, get_hash_name, is_executable, sosGetCommandOutput, find, tail +from sos.utilities import grep, DirTree, checksum, get_hash_name, is_executable, sosGetCommandOutput, find, tail, shell_out import sos TEST_DIR = os.path.dirname(__file__) @@ -71,6 +71,9 @@ class ExecutableTest(unittest.TestCase): path = os.path.join(TEST_DIR, 'test_exe.py') self.assertTrue(is_executable(path)) + def test_exe_file_abs_path(self): + self.assertTrue(is_executable("/usr/bin/timeout")) + def test_output(self): path = os.path.join(TEST_DIR, 'test_exe.py') ret, out, junk = sosGetCommandOutput(path) @@ -83,6 +86,10 @@ class ExecutableTest(unittest.TestCase): self.assertEquals(ret, 127) self.assertEquals(out, "") + def test_shell_out(self): + path = os.path.join(TEST_DIR, 'test_exe.py') + self.assertEquals("executed", shell_out(path)) + class FindTest(unittest.TestCase): -- cgit