Repeat suspend testing at different points

Signed-off-by: Euan Harris <euan.harris@citrix.com>

diff --git a/test_domain_suspend.c b/test_domain_suspend.c
index 0075577b562784b05248277bc9fd141adcb6330b..499661acf02e9f66c2db95791d6babf21c828b40 100644 (file)
--- a/test_domain_suspend.c
+++ b/test_domain_suspend.c
@@ -5,39 +5,91 @@
 #include "eventloop_runner.h"
 #include "testcase_utils.h"
 
+/*
+ * This test calls libxl_domain_suspend() repeatedly, cancelling
+ * it at different points in its lifecycle.   
+ * 
+ * Preconditions:
+ *   No existing domain is called test_domain_suspend.
+ * 
+ * Postconditions:
+ *   After cancellation, the domain exists and is running.
+ *
+ *   After cancellation, the domain can be suspended (and cancelled)
+ *   again.
+ */
+
 void *testcase(struct test *tc)
 {
+    int count;
+
+    libxl_domain_config dc;
     uint32_t domid;
     struct event ev;
-    libxl_domain_config dc;
-
-    printf("thread started\n");
 
     init_domain_config(&dc, "test_domain_suspend",
                        "resources/vmlinuz-4.0.4-301.fc22.x86_64",
                        "resources/initrd.xen-4.0.4-301.fc22.x86_64",
                        "resources/Fedora-Cloud-Base-22-20150521.x86_64.qcow2",
                        "resources/cloudinit.iso");
-    do_domain_create(tc, &dc, &domid);
 
+    do_domain_create(tc, &dc, &domid);
     wait_for(tc, EV_LIBXL_CALLBACK, &ev);
     printf("domid: %d\n", domid);
-    libxl_domain_config_dispose(&dc);
 
     libxl_domain_unpause(tc->ctx, domid);
     printf("domain %d unpaused\n", domid);
 
     printf("waiting for domain to boot\n");
-    wait_for_n(tc, EV_EVENTLOOP, 10, &ev);
+    wait_for_n(tc, EV_EVENTLOOP, 10, &ev);     
 
-    /* Start a suspend, and immediately cancel it */
-    do_domain_suspend(tc, domid);
-    wait_for(tc, EV_FD_EVENT, &ev);
-    libxl_ao_cancel(tc->ctx, &tc->ao_how);
+    /* test should wait for some number of fd_events, cancel, then
+       skip all fd_events and cancel on the next non-fd event, or at
+       least the next fd event on a different fd */
+    for (count = 1; count < 100; count++) {
+        int rc;
 
-    wait_for(tc, EV_LIBXL_CALLBACK, &ev);
-    printf("domain %d suspended\n", domid);
+        printf("\n****** Will cancel after %d events ******\n", count);
 
-    eventloop_halt();
-    pthread_exit(NULL);
+        do_domain_suspend(tc, domid);
+
+        if (wait_until_n(tc, EV_LIBXL_CALLBACK, count, &ev)) {
+            /* The API call returned before we could cancel it.
+               It should have returned successfully.
+             */
+            printf("libxl_domain_suspend returned %d\n",
+                   ev.u.callback_event.rc);
+            assert(ev.u.callback_event.rc == 0);
+
+            /* No operation in progress - cancelling should return an error */
+            rc = libxl_ao_cancel(tc->ctx, &tc->ao_how);
+            printf("libxl_ao_cancel returned %d\n", rc);
+            assert(rc == ERROR_NOTFOUND);
+
+            break;
+        }
+
+        rc = libxl_ao_cancel(tc->ctx, &tc->ao_how);
+
+        /* Calling cancel on a cancellable operation should not return an
+           error, unless the operation happened to complete in the meantime.
+         */
+        printf("libxl_ao_cancel returned %d\n", rc);
+        assert(rc == ERROR_NOTFOUND || rc == 0);
+
+        /* The API call's return code should indicate that it was cancelled */
+        wait_for(tc, EV_LIBXL_CALLBACK, &ev);
+        printf("libxl_domain_suspend returned %d\n",
+               ev.u.callback_event.rc);
+        assert(ev.u.callback_event.rc == ERROR_CANCELLED
+               || ev.u.callback_event.rc == 0);
+
+        /* Suspend was cancelled - the domain should still be running */
+        assert(!libxl_domain_info(tc->ctx, NULL, domid));
+    }
+
+    libxl_domain_destroy(tc->ctx, domid, 0);
+    libxl_domain_config_dispose(&dc);
+    test_exit();
+    return NULL;
 }