qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v3 4/5] qemu-iotests: let "check" spawn an arbitrary test com


From: Paolo Bonzini
Subject: Re: [PATCH v3 4/5] qemu-iotests: let "check" spawn an arbitrary test command
Date: Tue, 30 Mar 2021 13:12:17 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0

On 30/03/21 12:57, Max Reitz wrote:

297 says:

check:125: error: Argument 1 to "Path" has incompatible type "Optional[str]"; expected 
"Union[str, _PathLike[str]]"
Found 1 error in 1 file (checked 1 source file)

Weird, I had tested this and I cannot reproduce it.


diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index df9fd733ff..7c9d3a0852 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -122,12 +122,13 @@ if __name__ == '__main__':
              sys.exit("missing command after '--'")
          cmd = args.tests
          env.print_env()
-        exec_path = Path(shutil.which(cmd[0]))
-        if exec_path is None:
+        exec_pathstr = shutil.which(cmd[0])
+        if exec_pathstr is None:
              sys.exit('command not found: ' + cmd[0])
-        cmd[0] = exec_path.resolve()
+        exec_path = Path(exec_pathstr).resolve()
+        cmd[0] = str(exec_path)
          full_env = env.prepare_subprocess(cmd)
-        os.chdir(Path(exec_path).parent)
+        os.chdir(exec_path.parent)
          os.execve(cmd[0], cmd, full_env)

      testfinder = TestFinder(test_dir=env.source_iotests)


But now these are so many changes that I feel uncomfortable making this change myself.  This series only affects the iotests, so AFAIU we are in no hurry to get this into rc1, and it can still go into rc2.

Go ahead and squash it.

Technically I think resolve() is not needed because we're basically just doing "dirname" and not going upwards in the directory tree. That would leave the smaller change in message id 51523e26-a184-9434-cb60-277c7b3c67d6@redhat.com. However, it doesn't hurt either and others may have the same doubt as you.

Thanks Max!

Paolo




reply via email to

[Prev in Thread] Current Thread [Next in Thread]