aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/plugin_tests.py1
-rw-r--r--tests/unittests/sosreport_pexpect.py36
-rw-r--r--tests/unittests/utilities_tests.py3
3 files changed, 2 insertions, 38 deletions
diff --git a/tests/unittests/plugin_tests.py b/tests/unittests/plugin_tests.py
index 0105e3b8..0dfa243d 100644
--- a/tests/unittests/plugin_tests.py
+++ b/tests/unittests/plugin_tests.py
@@ -429,6 +429,7 @@ class RegexSubTests(unittest.TestCase):
"never_copied", r"^(.*)$", "foobar"))
def test_no_replacements(self):
+ self.mp.sysroot = '/'
self.mp.add_copy_spec(j("tail_test.txt"))
self.mp.collect()
replacements = self.mp.do_file_sub(
diff --git a/tests/unittests/sosreport_pexpect.py b/tests/unittests/sosreport_pexpect.py
deleted file mode 100644
index 3614fa5b..00000000
--- a/tests/unittests/sosreport_pexpect.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is part of the sos project: https://github.com/sosreport/sos
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# version 2 of the GNU General Public License.
-#
-# See the LICENSE file in the source distribution for further information.
-import unittest
-import pexpect
-
-from os import kill
-from signal import SIGINT
-
-
-class PexpectTest(unittest.TestCase):
- def test_plugins_install(self):
- sos = pexpect.spawn('/usr/sbin/sosreport -l')
- try:
- sos.expect('plugin.*does not install, skipping')
- except pexpect.EOF:
- pass
- else:
- self.fail("a plugin does not install or sosreport is too slow")
- kill(sos.pid, SIGINT)
-
- def test_batchmode_removes_questions(self):
- sos = pexpect.spawn('/usr/sbin/sosreport --batch')
- grp = sos.expect('send this file to your support representative.', 15)
- self.assertEquals(grp, 0)
- kill(sos.pid, SIGINT)
-
-
-if __name__ == '__main__':
- unittest.main()
-
-# vim: set et ts=4 sw=4 :
diff --git a/tests/unittests/utilities_tests.py b/tests/unittests/utilities_tests.py
index 83a4dc28..19524819 100644
--- a/tests/unittests/utilities_tests.py
+++ b/tests/unittests/utilities_tests.py
@@ -78,9 +78,8 @@ class ExecutableTest(unittest.TestCase):
def test_output_chdir(self):
cmd = "/bin/bash -c 'echo $PWD'"
result = sos_get_command_output(cmd, chdir=TEST_DIR)
- print(result)
self.assertEquals(result['status'], 0)
- self.assertEquals(result['output'].strip(), TEST_DIR)
+ self.assertTrue(result['output'].strip().endswith(TEST_DIR))
def test_shell_out(self):
self.assertEquals("executed\n", shell_out('echo executed'))