Fixed virsh test suite

ChangeLog

+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

tests/virshdata/domid-fc4.txt

-1
+2
 

tests/virshdata/dominfo-fc4.txt

-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
 

tests/virshdata/list-custom.txt

  Id Name                 State
 ----------------------------------
-  0 fv0                  running
-  1 fc4                  running
+  1 fv0                  running
+  2 fc4                  running
 

tests/virshdata/list-default.txt

  Id Name                 State
 ----------------------------------
-  0 Domain-0             running
+  1 test                 running
 

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
 

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",