[libvirt] [PATCH 3/5] domainsnapshotxml2xml: Move files with conflicting names

Peter Krempa pkrempa at redhat.com
Wed Dec 4 17:55:44 UTC 2013


The new tests that will be added later would colide with files of
existing tests. Move and rename those files.
---
 .../{disk_snapshot.xml => disk_snapshot_redefine.xml}                 | 0
 .../{external_vm.xml => external_vm_redefine.xml}                     | 0
 tests/domainsnapshotxml2xmltest.c                                     | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/domainsnapshotxml2xmlout/{disk_snapshot.xml => disk_snapshot_redefine.xml} (100%)
 rename tests/domainsnapshotxml2xmlout/{external_vm.xml => external_vm_redefine.xml} (100%)

diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
similarity index 100%
rename from tests/domainsnapshotxml2xmlout/disk_snapshot.xml
rename to tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
diff --git a/tests/domainsnapshotxml2xmlout/external_vm.xml b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
similarity index 100%
rename from tests/domainsnapshotxml2xmlout/external_vm.xml
rename to tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index bc41a11..d8055e8 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -207,13 +207,13 @@ mymain(void)
     setenv("PATH", "/bin", 1);

     DO_TEST_OUT("all_parameters", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", true);
-    DO_TEST_OUT("disk_snapshot", "c7a5fdbd-edaf-9455-926a-d65c16db1809", true);
+    DO_TEST_OUT("disk_snapshot_redefine", "c7a5fdbd-edaf-9455-926a-d65c16db1809", true);
     DO_TEST_OUT("full_domain", "c7a5fdbd-edaf-9455-926a-d65c16db1809", true);
     DO_TEST_OUT("noparent_nodescription_noactive", NULL, false);
     DO_TEST_OUT("noparent_nodescription", NULL, true);
     DO_TEST_OUT("noparent", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", false);
     DO_TEST_OUT("metadata", "c7a5fdbd-edaf-9455-926a-d65c16db1809", false);
-    DO_TEST_OUT("external_vm", "c7a5fdbd-edaf-9455-926a-d65c16db1809", false);
+    DO_TEST_OUT("external_vm_redefine", "c7a5fdbd-edaf-9455-926a-d65c16db1809", false);

 cleanup:
     if (testSnapshotXMLVariableLineRegex)
-- 
1.8.4.3




More information about the libvir-list mailing list