aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/cleaner_tests/basic_function_tests/report_with_mask.py4
-rw-r--r--tests/collect_tests/help_output_tests.py2
-rw-r--r--tests/report_tests/basic_report_tests.py6
-rw-r--r--tests/report_tests/encryption_tests.py5
-rw-r--r--tests/report_tests/exception_tests.py6
-rw-r--r--tests/report_tests/options_tests/options_tests.py4
-rw-r--r--tests/sos_tests.py2
-rw-r--r--tests/unittests/policy_tests.py6
8 files changed, 18 insertions, 17 deletions
diff --git a/tests/cleaner_tests/basic_function_tests/report_with_mask.py b/tests/cleaner_tests/basic_function_tests/report_with_mask.py
index 06bb2122..bb72cdde 100644
--- a/tests/cleaner_tests/basic_function_tests/report_with_mask.py
+++ b/tests/cleaner_tests/basic_function_tests/report_with_mask.py
@@ -119,7 +119,7 @@ class DefaultRemoveBinaryFilesTest(StageTwoReportTest):
self.assertFileNotCollected('var/log/binary_test.tar.xz')
def test_binaries_removed_reported(self):
- self.assertOutputContains('\[removed .* unprocessable files\]')
+ self.assertOutputContains(r'\[removed .* unprocessable files\]')
class KeepBinaryFilesTest(StageTwoReportTest):
@@ -142,4 +142,4 @@ class KeepBinaryFilesTest(StageTwoReportTest):
self.assertFileCollected('var/log/binary_test.tar.xz')
def test_no_binaries_reported_removed(self):
- self.assertOutputNotContains('\[removed .* unprocessable files\]')
+ self.assertOutputNotContains(r'\[removed .* unprocessable files\]')
diff --git a/tests/collect_tests/help_output_tests.py b/tests/collect_tests/help_output_tests.py
index 258bb8d7..584ad498 100644
--- a/tests/collect_tests/help_output_tests.py
+++ b/tests/collect_tests/help_output_tests.py
@@ -65,7 +65,7 @@ class CollectOptionsHelpTest(StageOneOutputTest):
@skipIf(PEXPECT_PRESENT is False, "python3-pexpect not installed locally")
def test_cluster_profiles_shown(self):
- _out = re.search("Use the short name with --cluster-type or cluster options \(-c\)(.*?)The following cluster options are available:",
+ _out = re.search(r"Use the short name with --cluster-type or cluster options \(-c\)(.*?)The following cluster options are available:",
self.cmd_output.stdout, re.S).group(1).splitlines()
_profs = {}
for ln in _out:
diff --git a/tests/report_tests/basic_report_tests.py b/tests/report_tests/basic_report_tests.py
index a6fdf003..58618cbc 100644
--- a/tests/report_tests/basic_report_tests.py
+++ b/tests/report_tests/basic_report_tests.py
@@ -23,7 +23,7 @@ class NormalSoSReport(StageOneReportTest):
def test_debug_not_printed_to_console(self):
self.assertOutputNotContains('added cmd output')
- self.assertOutputNotContains('\[archive:.*\]')
+ self.assertOutputNotContains(r'\[archive:.*\]')
def test_postproc_called(self):
self.assertSosLogContains('substituting scrpath')
@@ -61,11 +61,11 @@ class LogLevelTest(StageOneReportTest):
sos_cmd = '-vvv -o kernel,host,boot,filesys'
def test_archive_logging_enabled(self):
- self.assertSosLogContains('DEBUG: \[archive:.*\]')
+ self.assertSosLogContains(r'DEBUG: \[archive:.*\]')
self.assertSosLogContains('Making leading paths for')
def test_debug_printed_to_console(self):
- self.assertOutputContains('\[plugin:.*\]')
+ self.assertOutputContains(r'\[plugin:.*\]')
class RestrictedSoSReport(StageOneReportTest):
diff --git a/tests/report_tests/encryption_tests.py b/tests/report_tests/encryption_tests.py
index 9ce401ec..d60d9d78 100644
--- a/tests/report_tests/encryption_tests.py
+++ b/tests/report_tests/encryption_tests.py
@@ -22,10 +22,11 @@ class EncryptedReportTest(StageOneReportTest):
sos_cmd = "-o kernel --encrypt-pass %s" % encrypt_pass
def test_archive_gpg_encrypted(self):
- self.assertOutputContains('/.*sosreport-.*tar.*\.gpg')
+ self.assertOutputContains(r'/.*sosreport-.*tar.*\.gpg')
_cmd = "file %s" % self.encrypted_path
res = process.run(_cmd)
- self.assertTrue("GPG symmetrically encrypted data" in res.stdout.decode())
+ self.assertTrue(("GPG symmetrically encrypted data" in res.stdout.decode())
+ or ("PGP symmetric key encrypted data" in res.stdout.decode()))
def test_tarball_named_secure(self):
self.assertTrue('secured-' in self.encrypted_path)
diff --git a/tests/report_tests/exception_tests.py b/tests/report_tests/exception_tests.py
index 769954a0..678c06d6 100644
--- a/tests/report_tests/exception_tests.py
+++ b/tests/report_tests/exception_tests.py
@@ -17,7 +17,7 @@ class InvalidPluginEnabledTest(StageOneReportExceptionTest):
sos_cmd = '-o foobar'
def test_caught_invalid_plugin(self):
- self.assertOutputContains('a non-existing plugin \(foobar\)')
+ self.assertOutputContains(r'a non-existing plugin \(foobar\)')
class InvalidPluginOptionTest(StageOneReportExceptionTest):
@@ -28,7 +28,7 @@ class InvalidPluginOptionTest(StageOneReportExceptionTest):
sos_cmd = '-o kernel -k kernel.colonel=on'
def test_caught_invalid_plugin_option(self):
- self.assertOutputContains('no such option "colonel" for plugin \(kernel\)')
+ self.assertOutputContains(r'no such option "colonel" for plugin \(kernel\)')
class InvalidReportOptionTest(StageOneReportExceptionTest):
@@ -39,7 +39,7 @@ class InvalidReportOptionTest(StageOneReportExceptionTest):
sos_cmd = '--magic'
def test_caught_invalid_option(self):
- self.assertOutputContains('unrecognized arguments\: --magic')
+ self.assertOutputContains(r'unrecognized arguments\: --magic')
class InvalidPluginDisableTest(StageOneReportTest):
diff --git a/tests/report_tests/options_tests/options_tests.py b/tests/report_tests/options_tests/options_tests.py
index 997042ba..e912da8d 100644
--- a/tests/report_tests/options_tests/options_tests.py
+++ b/tests/report_tests/options_tests/options_tests.py
@@ -27,10 +27,10 @@ class OptionsFromConfigTest(StageTwoReportTest):
def test_plugopts_logged_from_config(self):
self.assertSosLogContains(
- "Set kernel plugin option to \(name=with-timer, desc='gather /proc/timer\* statistics', value=True, default=False\)"
+ r"Set kernel plugin option to \(name=with-timer, desc='gather /proc/timer\* statistics', value=True, default=False\)"
)
self.assertSosLogContains(
- "Set kernel plugin option to \(name=trace, desc='gather /sys/kernel/debug/tracing/trace file', value=True, default=False\)"
+ r"Set kernel plugin option to \(name=trace, desc='gather /sys/kernel/debug/tracing/trace file', value=True, default=False\)"
)
def test_disabled_plugopts_not_loaded(self):
diff --git a/tests/sos_tests.py b/tests/sos_tests.py
index d15395f0..1fb31875 100644
--- a/tests/sos_tests.py
+++ b/tests/sos_tests.py
@@ -424,7 +424,7 @@ class BaseSoSReportTest(BaseSoSTest):
override
"""
try:
- return re.findall('/.*sosreport-.*tar.*\.gpg', self.cmd_output.stdout)[-1]
+ return re.findall(r'/.*sosreport-.*tar.*\.gpg', self.cmd_output.stdout)[-1]
except:
return None
diff --git a/tests/unittests/policy_tests.py b/tests/unittests/policy_tests.py
index 1cefaab7..a64275b8 100644
--- a/tests/unittests/policy_tests.py
+++ b/tests/unittests/policy_tests.py
@@ -108,7 +108,7 @@ class RpmPackageManagerTests(unittest.TestCase):
self.pm = RpmPackageManager()
def test_load_all_packages(self):
- self.assertNotEquals(self.pm.packages, {})
+ self.assertNotEqual(self.pm.packages, {})
def test_pkg_is_formatted(self):
kpkg = self.pm.pkg_by_name('coreutils')
@@ -125,7 +125,7 @@ class DpkgPackageManagerTests(unittest.TestCase):
self.pm = DpkgPackageManager()
def test_load_all_packages(self):
- self.assertNotEquals(self.pm.packages, {})
+ self.assertNotEqual(self.pm.packages, {})
def test_pkg_is_formatted(self):
kpkg = self.pm.pkg_by_name('coreutils')
@@ -141,7 +141,7 @@ class MultiPackageManagerTests(unittest.TestCase):
fallbacks=[DpkgPackageManager])
def test_load_all_packages(self):
- self.assertNotEquals(self.pm.packages, {})
+ self.assertNotEqual(self.pm.packages, {})
def test_pkg_is_formatted(self):
kpkg = self.pm.pkg_by_name('coreutils')