[tck PATCH v2 02/13] scripts: strip quotes from URI before checking it

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

 



The config file may have the URI listed with or without quotes, and the
nwfilter tests didn't strip quotes before checking against the
whitelisted URI.

Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
 scripts/networks/networkApplyTest.sh    | 2 +-
 scripts/nwfilter/nwfilter2vmtest.sh     | 2 +-
 scripts/nwfilter/nwfilter_concurrent.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/networks/networkApplyTest.sh b/scripts/networks/networkApplyTest.sh
index da48eef..2a6431e 100644
--- a/scripts/networks/networkApplyTest.sh
+++ b/scripts/networks/networkApplyTest.sh
@@ -12,7 +12,7 @@ uri=$(sed -n '/^uri[     ]*=[     ]*/ {
 $ {
   x
   p
-}' < "$LIBVIRT_TCK_CONFIG")
+}' < "$LIBVIRT_TCK_CONFIG" | sed -e 's/"//g')
 : "${uri:=qemu:///system}"
 
 LIBVIRT_URI=${uri}
diff --git a/scripts/nwfilter/nwfilter2vmtest.sh b/scripts/nwfilter/nwfilter2vmtest.sh
index 90a5255..ae28b73 100644
--- a/scripts/nwfilter/nwfilter2vmtest.sh
+++ b/scripts/nwfilter/nwfilter2vmtest.sh
@@ -16,7 +16,7 @@ VIRSH=virsh
 $ {
   x
   p
-}' < "$LIBVIRT_TCK_CONFIG")
+}' < "$LIBVIRT_TCK_CONFIG" | sed -e 's/"//g')
 : "${uri:=qemu:///system}"
 
 LIBVIRT_URI=${uri}
diff --git a/scripts/nwfilter/nwfilter_concurrent.sh b/scripts/nwfilter/nwfilter_concurrent.sh
index 4c9b878..c42dd78 100644
--- a/scripts/nwfilter/nwfilter_concurrent.sh
+++ b/scripts/nwfilter/nwfilter_concurrent.sh
@@ -12,7 +12,7 @@ uri=$(sed -n '/^uri[     ]*=[     ]*/ {
 $ {
   x
   p
-}' < "$LIBVIRT_TCK_CONFIG")
+}' < "$LIBVIRT_TCK_CONFIG" | sed -e 's/"//g')
 : "${uri:=qemu:///system}"
 
 LIBVIRT_URI=${uri}
-- 
2.17.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux