Message ID | 20210109122631.167314-2-vsementsov@virtuozzo.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Rework iotests/check | expand |
On 1/9/21 6:26 AM, Vladimir Sementsov-Ogievskiy wrote: > If you run './check 277', check includes common.config which adjusts > $PATH to include '.' first, and therefore finds nbd-fault-injector.py > on PATH. But if you run './277' directly, there is nothing to adjust > PATH, and if '.' is not already on your PATH by other means, the test > fails because the executable is not found. Adjust how we invoke the > helper executable to avoid needing a PATH search in the first place. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > --- > tests/qemu-iotests/277 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) As this one touches NBD, I'm happy to queue it in my next NBD pull request if the entire series takes longer to collect enough reviews. > > diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277 > index d34f87021f..a39ce2d873 100755 > --- a/tests/qemu-iotests/277 > +++ b/tests/qemu-iotests/277 > @@ -42,7 +42,7 @@ def make_conf_file(event): > def start_server_NBD(event): > make_conf_file(event) > > - srv = subprocess.Popen(['nbd-fault-injector.py', '--classic-negotiation', > + srv = subprocess.Popen(['./nbd-fault-injector.py', '--classic-negotiation', > nbd_sock, conf_file], stdout=subprocess.PIPE, > stderr=subprocess.STDOUT, universal_newlines=True) > line = srv.stdout.readline() >
diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277 index d34f87021f..a39ce2d873 100755 --- a/tests/qemu-iotests/277 +++ b/tests/qemu-iotests/277 @@ -42,7 +42,7 @@ def make_conf_file(event): def start_server_NBD(event): make_conf_file(event) - srv = subprocess.Popen(['nbd-fault-injector.py', '--classic-negotiation', + srv = subprocess.Popen(['./nbd-fault-injector.py', '--classic-negotiation', nbd_sock, conf_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) line = srv.stdout.readline()