Fixed virsh test suite

diff --git a/ChangeLog b/ChangeLog
index 284d33326f0be136f1813e4c70cf10e68c626a49..a94bb9f06710a09a33cb20679c6c4d4f1b1accee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 26 07:59:52 EST 2007 Daniel Berrange <berrange@redhat.com>
+
+       * src/virshtest.c: Fixed up for new way test driver enumerates
+       domains
+
 Fri Jan 26 06:53:52 EST 2007 Daniel Berrange <berrange@redhat.com>
 
        * src/virshc: Added 'console' and 'vncdisplay' commands to

diff --git a/tests/virshdata/domid-fc4.txt b/tests/virshdata/domid-fc4.txt
index d474e1b4d626dbf09a9776c778e9f8691bc8b406..9a7456b54df272ef6e98ab7ba0784c8970b04808 100644 (file)
--- a/tests/virshdata/domid-fc4.txt
+++ b/tests/virshdata/domid-fc4.txt
@@ -1,2 +1,2 @@
-1
+2
 

diff --git a/tests/virshdata/dominfo-fc4.txt b/tests/virshdata/dominfo-fc4.txt
index a5776a9e3aa4e71abc501b6947cb39998dbe50c9..cca8b98fd5521019213aaae0ecd663a4bf2e4cdf 100644 (file)
--- a/tests/virshdata/dominfo-fc4.txt
+++ b/tests/virshdata/dominfo-fc4.txt
@@ -1,9 +1,9 @@
-Id:             1
+Id:             2
 Name:           fc4
 UUID:           ef861801-45b9-11cb-88e3-afbfe5370493
 OS Type:        linux
 State:          running
 CPU(s):         1
-Max memory:     131072 kB
+Max memory:     261072 kB
 Used memory:    131072 kB
 

diff --git a/tests/virshdata/list-custom.txt b/tests/virshdata/list-custom.txt
index 5e83b0a5fcda2ae5c535179d55c7ba97d0d8bbd7..2b48b2629d6c2bf45b8234069686918cd8b26888 100644 (file)
--- a/tests/virshdata/list-custom.txt
+++ b/tests/virshdata/list-custom.txt
@@ -1,5 +1,5 @@
  Id Name                 State
 ----------------------------------
-  0 fv0                  running
-  1 fc4                  running
+  1 fv0                  running
+  2 fc4                  running
 

diff --git a/tests/virshdata/list-default.txt b/tests/virshdata/list-default.txt
index 4528a01962c7d8cae7ba1693dd01caa8ecde05ac..d05095c36320305d71970c2879801639b8f9e781 100644 (file)
--- a/tests/virshdata/list-default.txt
+++ b/tests/virshdata/list-default.txt
@@ -1,4 +1,4 @@
  Id Name                 State
 ----------------------------------
-  0 Domain-0             running
+  1 test                 running
 

diff --git a/tests/virshdata/nodeinfo-custom.txt b/tests/virshdata/nodeinfo-custom.txt
index 9bc0ba5955dd59a082f7b6673e7b2e9bfd142f4a..1e98d63e9e08559b428dec0fbb6898b4b86ffd3d 100644 (file)
--- a/tests/virshdata/nodeinfo-custom.txt
+++ b/tests/virshdata/nodeinfo-custom.txt
@@ -5,5 +5,5 @@ CPU socket(s):       4
 Core(s) per socket:  4
 Thread(s) per core:  2
 NUMA cell(s):        4
-Memory size:         137438953 kB
+Memory size:         8192000 kB
 

diff --git a/tests/virshtest.c b/tests/virshtest.c
index f509bce076813b97d04b98c1dbe47c920a2e3d27..a075f78f4132e1f66f17c38f61830e81280d3a27 100644 (file)
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -114,7 +114,7 @@ static int testCompareDominfoByID(void *data ATTRIBUTE_UNUSED) {
   const char *const argv[] = {
     VIRSH_CUSTOM,
     "dominfo",
-    "1",
+    "2",
     NULL
   };
   return testCompareOutput("virshdata/dominfo-fc4.txt",
@@ -153,7 +153,7 @@ static int testCompareDomuuidByID(void *data ATTRIBUTE_UNUSED) {
   const char *const argv[] = {
     VIRSH_CUSTOM,
     "domuuid",
-    "1",
+    "2",
     NULL
   };
   return testCompareOutput("virshdata/domuuid-fc4.txt",
@@ -203,7 +203,7 @@ static int testCompareDomnameByID(void *data ATTRIBUTE_UNUSED) {
   const char *const argv[] = {
     VIRSH_CUSTOM,
     "domname",
-    "1",
+    "2",
     NULL
   };
   return testCompareOutput("virshdata/domname-fc4.txt",
@@ -228,7 +228,7 @@ static int testCompareDomstateByID(void *data ATTRIBUTE_UNUSED) {
   const char *const argv[] = {
     VIRSH_CUSTOM,
     "domstate",
-    "1",
+    "2",
     NULL
   };
   return testCompareOutput("virshdata/domstate-fc4.txt",