Skip to contentSkip to conversation

tests/functional/x86_64: Use the right Python interpreter & fix format string

PATCH In review Thomas Huth 3 participants 3 messages Jan 14

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/functional/x86_64: Use the right Python interpreter & fix format string

From: Thomas Huth <[email protected]>

The bad_vmstate test currently fails if the host does not have a "python3" binary in $PATH because the vmstate-static-checker.py script is executed directly, so that it gets run via its shebang line. Use the right Python interpreter from sys.executable to fix this problem.

Additionally, there was another bug with the formatting of the error message in case of failures: The "+" operator can only concatenate strings, but not strings with integers. Use a proper format string here instead.

---
 tests/functional/x86_64/test_bad_vmstate.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tests/functional/x86_64/test_bad_vmstate.py +4 -2
index 40098a8490b..71a1c0cf638 100755
@@ -5,6 +5,7 @@
 '''Test whether the vmstate-static-checker script detects problems correctly'''
 
 import subprocess
+import sys
 
 from qemu_test import QemuBaseTest
 
@@ -41,12 +42,13 @@ def test_checker(self):
                                        'vmstate-static-checker.py')
 
         self.log.info('Comparing %s with %s', src_json, dst_json)
-        cp = subprocess.run([checkerscript, '-s', src_json, '-d', dst_json],
+        cp = subprocess.run([sys.executable, checkerscript,
+                             '-s', src_json, '-d', dst_json],
                             stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT,
                             text=True, check=False)
         if cp.returncode != 13:
-            self.fail('Unexpected return code of vmstate-static-checker: ' +
+            self.fail('Unexpected return code of vmstate-static-checker: %d' %
                       cp.returncode)
         if cp.stdout != EXPECTED_OUTPUT:
             self.log.info('vmstate-static-checker output:\n%s', cp.stdout)
Signature · 1 line
2.52.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Thomas Huth

From: Thomas Huth <[email protected]>

The bad_vmstate test currently fails if the host does not have a "python3" binary in $PATH because the vmstate-static-checker.py script is executed directly, so that it gets run via its shebang line. Use the right Python interpreter from sys.executable to fix this problem.

Quoted 8 lines

Additionally, there was another bug with the formatting of the error message in case of failures: The "+" operator can only concatenate strings, but not strings with integers. Use a proper format string here instead.

---
 tests/functional/x86_64/test_bad_vmstate.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Acked-by on v1 1/1
#2 lore raw
In reply to Thomas Huth
Quoted 34 lines · Thomas Huth

From: Thomas Huth <[email protected]>

The bad_vmstate test currently fails if the host does not have a "python3" binary in $PATH because the vmstate-static-checker.py script is executed directly, so that it gets run via its shebang line. Use the right Python interpreter from sys.executable to fix this problem.

Additionally, there was another bug with the formatting of the error message in case of failures: The "+" operator can only concatenate strings, but not strings with integers. Use a proper format string here instead.

---
 tests/functional/x86_64/test_bad_vmstate.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tests/functional/x86_64/test_bad_vmstate.py +2 -1
index 40098a8490b..71a1c0cf638 100755
@@ -5,6 +5,7 @@
 '''Test whether the vmstate-static-checker script detects problems correctly'''
 
 import subprocess
+import sys
 
 from qemu_test import QemuBaseTest
 
@@ -41,12 +42,13 @@ def test_checker(self):
                                        'vmstate-static-checker.py')
 
         self.log.info('Comparing %s with %s', src_json, dst_json)
-        cp = subprocess.run([checkerscript, '-s', src_json, '-d', dst_json],
+        cp = subprocess.run([sys.executable, checkerscript,

tests/functional/x86_64/test_bad_vmstate.py def test_checker(self): · line 54

Quoted 10 lines
tests/functional/x86_64/test_bad_vmstate.py +2 -1
+                             '-s', src_json, '-d', dst_json],
                             stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT,
                             text=True, check=False)
         if cp.returncode != 13:
-            self.fail('Unexpected return code of vmstate-static-checker: ' +
+            self.fail('Unexpected return code of vmstate-static-checker: %d' %
                       cp.returncode)
         if cp.stdout != EXPECTED_OUTPUT:
             self.log.info('vmstate-static-checker output:\n%s', cp.stdout)