From 98f77e0c0839ef569d8e59fc01ccd04c662c265d Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Thu, 10 Jun 2021 15:56:30 +0200 Subject: [PATCH] Fix gating tests syntax compatibility with python3 Resolves: #1938705 --- device-mapper-persistent-data.spec | 8 ++++++-- tests/functions_test/dmpd_functions.py | 12 ++++++------ tests/functions_test/dmpd_library.py | 13 ++++++++----- tests/tools_not_linked_usr/tools_not_linked_usr.py | 12 ++++++------ 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 3fd1b0a..7778330 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -8,7 +8,7 @@ Summary: Device-mapper Persistent Data Tools Name: device-mapper-persistent-data Version: 0.9.0 -Release: 5%{?dist}%{?release_suffix} +Release: 6%{?dist}%{?release_suffix} License: GPLv3+ URL: https://github.com/jthornber/thin-provisioning-tools #Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-%%{version}.tar.gz @@ -34,7 +34,7 @@ BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel Requires: expat %ifarch %{rust_arches} %if 0%{?rhel} -BuildRequires: rust-packaging +BuildRequires: rust-toolset %else BuildRequires: rust-packaging %endif @@ -157,6 +157,10 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install-rust-tools #% {_sbindir}/thin_show_duplicates %changelog +* Thu Jun 10 2021 Marian Csontos - 0.9.0-6 +- Remove rust-packaging dependency. +- Fix gating test syntax. + * Mon Jun 07 2021 Marian Csontos - 0.9.0-5 - Fix important issues found by static analysis. diff --git a/tests/functions_test/dmpd_functions.py b/tests/functions_test/dmpd_functions.py index a908bcf..bcf02d6 100755 --- a/tests/functions_test/dmpd_functions.py +++ b/tests/functions_test/dmpd_functions.py @@ -195,7 +195,7 @@ def thin_clean(args): def thin_test(args): print("\n#######################################\n") - print ( + print( "INFO: Testing thin tools runtime provided by device_mapper_persistent_data") errors = [] @@ -415,7 +415,7 @@ def thin_test(args): def thin_errors_test(args): print("\n#######################################\n") - print ( + print( "INFO: Testing thin tools errors provided by device_mapper_persistent_data") errors = [] @@ -845,7 +845,7 @@ def cache_clean(args): def cache_test(args): print("\n#######################################\n") - print ("INFO: Testing cache tools runtime provided by device_mapper_persistent_data") + print("INFO: Testing cache tools runtime provided by device_mapper_persistent_data") errors = [] @@ -965,7 +965,7 @@ def cache_test(args): def cache_errors_test(args): print("\n#######################################\n") - print ("INFO: Testing cache tools errors provided by device_mapper_persistent_data") + print("INFO: Testing cache tools errors provided by device_mapper_persistent_data") errors = [] @@ -1223,10 +1223,10 @@ def main(): cache_clean(args) if not TC.tend(): - print "FAIL: test failed" + print("FAIL: test failed") sys.exit(1) - print "PASS: Test pass" + print("PASS: Test pass") sys.exit(0) diff --git a/tests/functions_test/dmpd_library.py b/tests/functions_test/dmpd_library.py index e8f1ed9..d50d08f 100755 --- a/tests/functions_test/dmpd_library.py +++ b/tests/functions_test/dmpd_library.py @@ -23,6 +23,9 @@ import sys, os import subprocess import time import fileinput +# TODO: Is this really necessary? Unlikely we will run into python2 in rawhide +# again... +from __future__ import print_function def _print(string): @@ -1042,7 +1045,7 @@ class LoopDev: _print("WARN: Could not create loop device image file") return ret_fail except OSError as e: - print >> sys.err, "command failed: ", e + print("command failed: ", e, file=sys.err) return ret_fail loop_path = self._get_loop_path(name) @@ -1125,7 +1128,7 @@ class LoopDev: name = self._standardize_name(name) # Just try to detach if device is connected, otherwise ignore - # print "INFO: Checking if ", loop_path, " exists, to be detached" + # print("INFO: Checking if ", loop_path, " exists, to be detached") dev_path = self._get_loop_path(name) if dev_path in devs: cmd = "losetup -d %s" % dev_path @@ -1199,7 +1202,7 @@ class LVM: cmd = "vgcreate %s %s %s" % (options, vg_name, pv_name) retcode = run(cmd, verbose=verbose) if (retcode != 0): - # _print ("WARN: Could not create %s" % vg_name) + # _print("WARN: Could not create %s" % vg_name) return False return True @@ -1321,7 +1324,7 @@ class LVM: cmd = "lvcreate %s %s -n %s" % (" ".join(str(i) for i in options), vg_name, lv_name) retcode = run(cmd, verbose=verbose) if (retcode != 0): - # _print ("WARN: Could not create %s" % lv_name) + # _print("WARN: Could not create %s" % lv_name) return False return True @@ -1514,7 +1517,7 @@ class DMPD: _print("WARN: Could not create file to %s metadata to." % command_message) return False except OSError as e: - print >> sys.err, "command failed: ", e + print("command failed: ", e, file=sys.err) return False return True diff --git a/tests/tools_not_linked_usr/tools_not_linked_usr.py b/tests/tools_not_linked_usr/tools_not_linked_usr.py index 7acb804..74053cf 100755 --- a/tests/tools_not_linked_usr/tools_not_linked_usr.py +++ b/tests/tools_not_linked_usr/tools_not_linked_usr.py @@ -20,19 +20,19 @@ import sys import re def run(cmd): - print "INFO: Running '%s'..." % cmd + print("INFO: Running '%s'..." % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) stdout, stderr = p.communicate() retcode = p.returncode output = stdout + stderr - print output + print(output) return retcode, output def start_test(): #if uses any library linked to /usr this my affect the tools during boot - print ("INFO: Making sure tools provided by device-mapper-persistent-data " + print("INFO: Making sure tools provided by device-mapper-persistent-data " "are not linked to /usr") #Paths where we should have no libraries linked from @@ -54,7 +54,7 @@ def start_test(): continue tool_error = 0 for lib_path in lib_paths: - print "INFO: Checking if %s is not linked to libraries at %s" % (tool, lib_path) + print("INFO: Checking if %s is not linked to libraries at %s" % (tool, lib_path)) ret, linked_lib = run("ldd %s" % tool) if ret != 0: print("FAIL: Could not list dynamically libraries for %s" % (tool)) @@ -83,10 +83,10 @@ def start_test(): def main(): if not start_test(): - print "FAIL: test failed" + print("FAIL: test failed") sys.exit(1) - print "PASS: Test pass" + print("PASS: Test pass") sys.exit(0) main()