|
 |
e7810f |
From c48f2594f2cca37bc1335d354961202db7baee17 Mon Sep 17 00:00:00 2001
|
|
|
e7810f |
From: Vratislav Podzimek <vpodzime@redhat.com>
|
|
|
e7810f |
Date: Fri, 24 Nov 2017 15:16:25 +0100
|
|
|
e7810f |
Subject: [PATCH] Do not skip integration tests on CentOS/RHEL
|
|
|
e7810f |
|
|
|
e7810f |
The scsi_debug module doesn't seem to be causing kernel panics
|
|
|
e7810f |
anymore.
|
|
|
e7810f |
|
|
|
e7810f |
Resolves: rhbz#1511974
|
|
|
e7810f |
---
|
|
|
e7810f |
src/tests/integration-test | 17 -----------------
|
|
|
e7810f |
1 file changed, 17 deletions(-)
|
|
|
e7810f |
|
|
|
e7810f |
diff --git a/src/tests/integration-test b/src/tests/integration-test
|
|
|
e7810f |
index 44ddec5..f863578 100755
|
|
|
e7810f |
--- a/src/tests/integration-test
|
|
|
e7810f |
+++ b/src/tests/integration-test
|
|
|
e7810f |
@@ -1744,17 +1744,6 @@ class MDRaid(UDisksTestCase):
|
|
|
e7810f |
# ----------------------------------------------------------------------------
|
|
|
e7810f |
|
|
|
e7810f |
|
|
|
e7810f |
-def get_distro_version():
|
|
|
e7810f |
- # 3rd to 6th fields from e.g. "CPE OS Name: cpe:/o:fedoraproject:fedora:27" or "CPE OS Name: cpe:/o:centos:centos:7"
|
|
|
e7810f |
- out = subprocess.check_output('hostnamectl status | grep "CPE OS Name"', shell=True).decode().strip()
|
|
|
e7810f |
- try:
|
|
|
e7810f |
- _project, distro, version = tuple(out.split(":")[3:6])
|
|
|
e7810f |
- except ValueError:
|
|
|
e7810f |
- print('Failed to get distribution and version from "%s". Aborting.' % out)
|
|
|
e7810f |
- sys.exit(1)
|
|
|
e7810f |
-
|
|
|
e7810f |
- return (distro, version)
|
|
|
e7810f |
-
|
|
|
e7810f |
if __name__ == '__main__':
|
|
|
e7810f |
argparser = argparse.ArgumentParser(description='udisks2 integration test suite')
|
|
|
e7810f |
argparser.add_argument('-l', '--log-file', dest='logfile',
|
|
|
e7810f |
@@ -1763,12 +1752,6 @@ if __name__ == '__main__':
|
|
|
e7810f |
help='name of test class or method (e. g. "Drive", "FS.test_ext2")')
|
|
|
e7810f |
cli_args = argparser.parse_args()
|
|
|
e7810f |
|
|
|
e7810f |
- distro, version = get_distro_version()
|
|
|
e7810f |
- if distro in ('centos', 'enterprise_linux'):
|
|
|
e7810f |
- print('Skipping integration tests on "%s %s".'\
|
|
|
e7810f |
- 'SCSI debug devices causing kernel panic.' % (distro, version))
|
|
|
e7810f |
- sys.exit(0)
|
|
|
e7810f |
-
|
|
|
e7810f |
UDisksTestCase.init(logfile=cli_args.logfile)
|
|
|
e7810f |
if cli_args.testname:
|
|
|
e7810f |
tests = unittest.TestLoader().loadTestsFromNames(
|
|
|
e7810f |
--
|
|
|
e7810f |
1.8.3.1
|
|
|
e7810f |
|