Fix test driver inactive domains and domain ID allocation

diff --git a/ChangeLog b/ChangeLog
index 7fb0c73bf2f3f8336d08634eae7499343d2e3c11..c858137ad45098455b5e0ba0d58de5a7adbee163 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/test.c: Increment dom ID tracker when setting up
+       default domain. Reset dom ID when destroying domain. Fix
+       listing of defined domains
+
 Fri Jul 25 14:00:27 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        Convert XenD XML->SEXPR conversion to new domain XML APIs

diff --git a/src/test.c b/src/test.c
index 9e7af464756833793edea1fc346221f8e13d8e99..c33933897a2e616095658ee966c994fbbe6d1fcc 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -259,7 +259,7 @@ static int testOpenDefault(virConnectPtr conn) {
         virDomainDefFree(domdef);
         goto error;
     }
-    domobj->def->id = 1;
+    domobj->def->id = privconn->nextDomID++;
     domobj->state = VIR_DOMAIN_RUNNING;
     domobj->persistent = 1;
 
@@ -776,6 +776,8 @@ static int testDestroyDomain (virDomainPtr domain)
     GET_DOMAIN(domain, -1);
 
     privdom->state = VIR_DOMAIN_SHUTOFF;
+    privdom->def->id = -1;
+    domain->id = -1;
     if (!privdom->persistent) {
         virDomainRemoveInactive(&privconn->domains,
                                 privdom);
@@ -1132,7 +1134,7 @@ static int testListDefinedDomains(virConnectPtr conn,
     dom = privconn->domains;
     memset(names, 0, sizeof(*names)*maxnames);
     while (dom && n < maxnames) {
-        if (virDomainIsActive(dom) &&
+        if (!virDomainIsActive(dom) &&
             !(names[n++] = strdup(dom->def->name)))
             goto no_memory;
         dom = dom->next;