Skip to contentSkip to conversation

iotests/041: Fix NBD socket path

PATCH In review Max Reitz 3 participants 3 messages Apr 24, 2020 – May 4, 2020

lore
Share & tools
lore

Max Reitz

author
#0 lore raw

PATCH 1/1 iotests/041: Fix NBD socket path

We should put all UNIX socket files into the sock_dir, not test_dir.

---
 tests/qemu-iotests/041 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/041 +1 -1
index 5d67bf14bf..46bf1f6c81 100755
@@ -35,7 +35,7 @@ quorum_img3 = os.path.join(iotests.test_dir, 'quorum3.img')
 quorum_repair_img = os.path.join(iotests.test_dir, 'quorum_repair.img')
 quorum_snapshot_file = os.path.join(iotests.test_dir, 'quorum_snapshot.img')
 
-nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock')
+nbd_sock_path = os.path.join(iotests.sock_dir, 'nbd.sock')
 
 class TestSingleDrive(iotests.QMPTestCase):
     image_len = 1 * 1024 * 1024 # MB
Signature · 1 line
2.25.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Max Reitz

We should put all UNIX socket files into the sock_dir, not test_dir.

---
  tests/qemu-iotests/041 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

I'm happy to queue this through my NBD tree, if you don't beat me to it through an iotest pull request.

Quoted 14 lines
tests/qemu-iotests/041 +1 -1
index 5d67bf14bf..46bf1f6c81 100755
@@ -35,7 +35,7 @@ quorum_img3 = os.path.join(iotests.test_dir, 'quorum3.img')
  quorum_repair_img = os.path.join(iotests.test_dir, 'quorum_repair.img')
  quorum_snapshot_file = os.path.join(iotests.test_dir, 'quorum_snapshot.img')
 
-nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock')
+nbd_sock_path = os.path.join(iotests.sock_dir, 'nbd.sock')
 
  class TestSingleDrive(iotests.QMPTestCase):
      image_len = 1 * 1024 * 1024 # MB
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org