From 8646b1253cad692a5ff0c10aeaa89b02cd0df25b Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Tue, 29 Aug 2017 17:51:07 +0200
Subject: [PATCH] tests: don't use unix socket path that matches auto-generated
 path

The test was introduced by 60135b22db6d.

The auto-generated path is removed by post-parse callback which
also changes the mode from "connect" to "bind" since the auto-generated
path makes sense only for "bind" mode.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args | 6 ++----
 tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml  | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args b/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args
index 133a2c6039..8c6586e483 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args
@@ -23,14 +23,12 @@ server,nowait \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -usb \
--chardev socket,id=charsmartcard0,path=/tmp/channel/domain-oldname/asdf,\
-reconnect=20 \
+-chardev socket,id=charsmartcard0,path=/tmp/channel/asdf,reconnect=20 \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
 -chardev socket,id=charchannel0,host=localhost,port=1234,reconnect=10 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=asdf \
--chardev socket,id=charchannel1,path=/tmp/channel/domain--1-QEMUGuest1/fdsa,\
-server,nowait,reconnect=0 \
+-chardev socket,id=charchannel1,path=/tmp/channel/fdsa,reconnect=0 \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\
 id=channel1,name=fdsa \
 -chardev socket,id=charredir0,host=localhost,port=3456,reconnect=15 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml b/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml
index e0664b2a95..41ee248db3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.xml
@@ -18,7 +18,7 @@
       </source>
     </redirdev>
     <smartcard mode='passthrough' type='unix'>
-      <source mode='connect' path='/tmp/channel/domain-oldname/asdf'>
+      <source mode='connect' path='/tmp/channel/asdf'>
         <reconnect enabled='yes' timeout='20'/>
       </source>
     </smartcard>
@@ -29,7 +29,7 @@
       <target type='virtio' name='asdf'/>
     </channel>
     <channel type='unix'>
-      <source mode='connect' path='/tmp/channel/domain-oldname/fdsa'>
+      <source mode='connect' path='/tmp/channel/fdsa'>
         <reconnect enabled='no'/>
       </source>
       <target type='virtio' name='fdsa'/>