tests: Set SASLdirs to default values

We use standard paths for almost everything else.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
index c32dd6acb6f16ae6a3ae20a2c06b79aaa660f407..bfdd2b6b5e7ae5aa33f2accbcd264fa452aa73ef 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
index 24eb456aa3f93c1b0abc17d477b85a5a102d659c..7bb5a3a2570196082b40e4fa65af6483652ce7e5 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
index fb3ebd8f5a8f4477283d6be3cb669ef4527d4993..9e4e16b8886e41a61968379228869f878287bb54 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index da64a8effa1d245c7e9cc00e1a1b15316c90889a..2bb1816d825c695b87a47c21279649ef0622da4c 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index 244b4bed81b13d6da609b24cef6cc842889c6752..aa80f11bfaaadd4f48de4da73255c823eded8810 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/etc/sasl2 \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index dc85e56d7d789216d805a140bce25ece507141c0..31fbb55b599aab8ca74c7a9db6ee30bcae1157d6 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -702,9 +702,9 @@ int qemuTestDriverInit(virQEMUDriver *driver)
     cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup");
 
     VIR_FREE(cfg->vncSASLdir);
-    cfg->vncSASLdir = g_strdup("/root/.sasl2");
+    cfg->vncSASLdir = g_strdup("/etc/sasl2");
     VIR_FREE(cfg->spiceSASLdir);
-    cfg->spiceSASLdir = g_strdup("/root/.sasl2");
+    cfg->spiceSASLdir = g_strdup("/etc/sasl2");
 
     VIR_FREE(cfg->spicePassword);
     cfg->spicePassword = g_strdup("123456");