X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Finterface-reconfigure.at;h=26a77eb9c8c0209e0a1b124392c32a9909a0b454;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=6bbaddd68f81042c2e010873d020fd788f1624d1;hpb=c78cd7deff9b1fdc7770b4ab2c84667562c27b3c;p=sliver-openvswitch.git

diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at
index 6bbaddd68..26a77eb9c 100644
--- a/tests/interface-reconfigure.at
+++ b/tests/interface-reconfigure.at
@@ -682,11 +682,11 @@ EOF
 }
 
 ifr_run () {
-    ./interface-reconfigure --root-prefix=$PWD --no-syslog "$@"
+    ./interface-reconfigure --root-prefix="`pwd`" --no-syslog "$@"
 }
 
 ifr_filter () {
-    sed -n -e "s,$PWD,,g" -e 's/ -- /\
+    sed -n -e "s,`pwd`,,g" -e 's/ -- /\
     /g' -e '/^Running command:/!p' stderr
 }]
 m4_divert_pop([PREPARE_TESTS])
@@ -696,6 +696,7 @@ AT_BANNER([interface-reconfigure])
 
 AT_SETUP([non-VLAN, non-bond])
 AT_KEYWORDS([interface-reconfigure])
+AT_SKIP_IF([$non_ascii_cwd])
 ifr_setup
 
 AT_CHECK([ifr_run --force xenbr2 up], [0], [], [stderr])
@@ -709,7 +710,7 @@ configure_datapath: bridge      - xenbr2
 configure_datapath: physical    - [u'eth2']
 configure_datapath: extra ports - []
 configure_datapath: extra bonds - []
-/usr/bin/ovs-vsctl --timeout=5 -vANY:console:off get-fail-mode xenbr2
+/usr/bin/ovs-vsctl -vconsole:off get-fail-mode xenbr2
 Applying changes to /etc/sysconfig/network-scripts/route-xenbr2 configuration
 Applying changes to /etc/sysconfig/network configuration
 Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration
@@ -724,7 +725,7 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration
     set Bridge xenbr2 fail_mode=secure
     remove Bridge xenbr2 other_config disable-in-band
     br-set-external-id xenbr2 xs-network-uuids d08c8749-0c8f-9e8d-ce25-fd364661ee99
-/usr/bin/ovs-vsctl --timeout=5 -vANY:console:off get interface eth2 ofport
+/usr/bin/ovs-vsctl -vconsole:off get interface eth2 ofport
 /usr/bin/ovs-ofctl add-flow xenbr2 idle_timeout=0,priority=0,in_port=5,arp,nw_proto=1,actions=local
 /usr/bin/ovs-ofctl add-flow xenbr2 idle_timeout=0,priority=0,in_port=local,arp,dl_src=00:15:17:a0:29:80,actions=5
 /usr/bin/ovs-ofctl add-flow xenbr2 idle_timeout=0,priority=0,in_port=5,dl_dst=00:15:17:a0:29:80,actions=local
@@ -771,6 +772,7 @@ AT_CLEANUP
 
 AT_SETUP([VLAN, non-bond])
 AT_KEYWORDS([interface-reconfigure])
+AT_SKIP_IF([$non_ascii_cwd])
 ifr_setup
 
 AT_CHECK([ifr_run --force xapi3 up], [0], [], [stderr])
@@ -844,6 +846,7 @@ AT_CLEANUP
 
 AT_SETUP([Bond, non-VLAN])
 AT_KEYWORDS([interface-reconfigure])
+AT_SKIP_IF([$non_ascii_cwd])
 ifr_setup
 
 # Pretend that bond0 exists, even though it would really be created by
@@ -932,6 +935,7 @@ AT_CLEANUP
 
 AT_SETUP([VLAN on bond])
 AT_KEYWORDS([interface-reconfigure])
+AT_SKIP_IF([$non_ascii_cwd])
 ifr_setup
 
 # Pretend that bond0 exists, even though it would really be created by