Fixed virsh test suite

This commit is contained in:
Daniel P. Berrange 2007-01-26 13:10:28 +00:00
parent 786024b7dd
commit b00f4ceb2b
7 changed files with 16 additions and 11 deletions

View File

@ -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> Fri Jan 26 06:53:52 EST 2007 Daniel Berrange <berrange@redhat.com>
* src/virshc: Added 'console' and 'vncdisplay' commands to * src/virshc: Added 'console' and 'vncdisplay' commands to

View File

@ -1,2 +1,2 @@
1 2

View File

@ -1,9 +1,9 @@
Id: 1 Id: 2
Name: fc4 Name: fc4
UUID: ef861801-45b9-11cb-88e3-afbfe5370493 UUID: ef861801-45b9-11cb-88e3-afbfe5370493
OS Type: linux OS Type: linux
State: running State: running
CPU(s): 1 CPU(s): 1
Max memory: 131072 kB Max memory: 261072 kB
Used memory: 131072 kB Used memory: 131072 kB

View File

@ -1,5 +1,5 @@
Id Name State Id Name State
---------------------------------- ----------------------------------
0 fv0 running 1 fv0 running
1 fc4 running 2 fc4 running

View File

@ -1,4 +1,4 @@
Id Name State Id Name State
---------------------------------- ----------------------------------
0 Domain-0 running 1 test running

View File

@ -5,5 +5,5 @@ CPU socket(s): 4
Core(s) per socket: 4 Core(s) per socket: 4
Thread(s) per core: 2 Thread(s) per core: 2
NUMA cell(s): 4 NUMA cell(s): 4
Memory size: 137438953 kB Memory size: 8192000 kB

View File

@ -114,7 +114,7 @@ static int testCompareDominfoByID(void *data ATTRIBUTE_UNUSED) {
const char *const argv[] = { const char *const argv[] = {
VIRSH_CUSTOM, VIRSH_CUSTOM,
"dominfo", "dominfo",
"1", "2",
NULL NULL
}; };
return testCompareOutput("virshdata/dominfo-fc4.txt", return testCompareOutput("virshdata/dominfo-fc4.txt",
@ -153,7 +153,7 @@ static int testCompareDomuuidByID(void *data ATTRIBUTE_UNUSED) {
const char *const argv[] = { const char *const argv[] = {
VIRSH_CUSTOM, VIRSH_CUSTOM,
"domuuid", "domuuid",
"1", "2",
NULL NULL
}; };
return testCompareOutput("virshdata/domuuid-fc4.txt", return testCompareOutput("virshdata/domuuid-fc4.txt",
@ -203,7 +203,7 @@ static int testCompareDomnameByID(void *data ATTRIBUTE_UNUSED) {
const char *const argv[] = { const char *const argv[] = {
VIRSH_CUSTOM, VIRSH_CUSTOM,
"domname", "domname",
"1", "2",
NULL NULL
}; };
return testCompareOutput("virshdata/domname-fc4.txt", return testCompareOutput("virshdata/domname-fc4.txt",
@ -228,7 +228,7 @@ static int testCompareDomstateByID(void *data ATTRIBUTE_UNUSED) {
const char *const argv[] = { const char *const argv[] = {
VIRSH_CUSTOM, VIRSH_CUSTOM,
"domstate", "domstate",
"1", "2",
NULL NULL
}; };
return testCompareOutput("virshdata/domstate-fc4.txt", return testCompareOutput("virshdata/domstate-fc4.txt",