From b00f4ceb2bc886071e276aa84ec2faf49b5f2ad2 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Fri, 26 Jan 2007 13:10:28 +0000
Subject: [PATCH] Fixed virsh test suite

---
 ChangeLog                           | 5 +++++
 tests/virshdata/domid-fc4.txt       | 2 +-
 tests/virshdata/dominfo-fc4.txt     | 4 ++--
 tests/virshdata/list-custom.txt     | 4 ++--
 tests/virshdata/list-default.txt    | 2 +-
 tests/virshdata/nodeinfo-custom.txt | 2 +-
 tests/virshtest.c                   | 8 ++++----
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 284d33326f..a94bb9f067 100644
--- 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 d474e1b4d6..9a7456b54d 100644
--- 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 a5776a9e3a..cca8b98fd5 100644
--- 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 5e83b0a5fc..2b48b2629d 100644
--- 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 4528a01962..d05095c363 100644
--- 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 9bc0ba5955..1e98d63e9e 100644
--- 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 f509bce076..a075f78f41 100644
--- 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",