From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 22 Jul 2013 12:56:26 +0000 (+0200)
Subject: Move pool XML out of storagevolxml2argvdata
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=823778829e851495d20d6d68a8cedafc85ad7ef5;p=libvirt.git

Move pool XML out of storagevolxml2argvdata

Reuse the pool definition from storagepoolxml2xmlin.
---

diff --git a/tests/storagevolxml2argvdata/pool-dir.xml b/tests/storagevolxml2argvdata/pool-dir.xml
deleted file mode 100644
index e10ccb7ca3..0000000000
--- a/tests/storagevolxml2argvdata/pool-dir.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<pool type='dir'>
-  <name>virtimages</name>
-  <uuid>70a7eb15-6c34-ee9c-bf57-69e8e5ff3fb2</uuid>
-  <capacity>0</capacity>
-  <allocation>0</allocation>
-  <available>0</available>
-  <source>
-  </source>
-  <target>
-    <path>///var/////lib/libvirt/images//</path>
-    <permissions>
-      <mode>0700</mode>
-      <owner>-1</owner>
-      <group>-1</group>
-      <label>some_label_t</label>
-    </permissions>
-  </target>
-</pool>
diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 9a05da63c4..8ef438fff9 100644
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -124,7 +124,7 @@ testCompareXMLToArgvHelper(const void *data)
         virAsprintf(&inputvolxml, "%s/storagevolxml2argvdata/%s.xml",
                     abs_srcdir, info->inputvol) < 0)
         goto cleanup;
-    if (virAsprintf(&poolxml, "%s/storagevolxml2argvdata/%s.xml",
+    if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml",
                     abs_srcdir, info->pool) < 0 ||
         virAsprintf(&volxml, "%s/storagevolxml2argvdata/%s.xml",
                     abs_srcdir, info->vol) < 0) {