Fix a subtle error in channel assignment.

1 files changed, 28 insertions, 12 deletions

diff --git a/valgrind-audit b/valgrind-audit
index 9c3847e9..6ad0c661 100755
--- a/valgrind-audit
+++ b/valgrind-audit
@@ -16,12 +16,12 @@ try:
 
     print "\n**** Add and remove a client.\n"
     c1 = test.client_add("w\n")
-    test.wait(3)
+    test.gather(3)
     test.client_remove(c1)
 
-    print "\n**** Remove the GPS.\n"
+    print "\n**** Remove the GPS."
     test.gps_remove(gps1)
-    print "*** Test #1 complete."
+    print "*** Test #1 complete.\n"
     test.wait(3)
 
     ######################################################################
@@ -32,19 +32,19 @@ try:
 
     print "\n**** Add and remove first client.\n"
     c1 = test.client_add("w\n")
-    test.wait(3)
+    test.gather(3)
     test.client_remove(c1)
     test.wait(3)
 
     print "\n**** Add and remove second client.\n"
     c2 = test.client_add("w\n")
-    test.wait(3)
+    test.gather(3)
     test.client_remove(c2)
     test.wait(3)
 
-    print "\n**** Remove the GPS.\n"
+    print "\n**** Remove the GPS."
     test.gps_remove(gps1)
-    print "*** Test #2 complete."
+    print "*** Test #2 complete.\n"
     test.wait(3)
 
     ######################################################################
@@ -55,20 +55,36 @@ try:
 
     print "\n**** Add first client.\n"
     c1 = test.client_add("w\n")
-    test.wait(2)
+    test.gather(2)
     print "\n**** Add second client.\n"
     c2 = test.client_add("w\n")
-    test.wait(3)
+    test.gather(3)
     print "\n**** Remove first client.\n"
     test.client_remove(c1)
-    test.wait(2)
+    test.gather(2)
     print "\n**** Remove second client.\n"
     test.client_remove(c2)
 
-    print "\n**** Remove the GPS.\n"
+    print "\n**** Remove the GPS."
+    test.gps_remove(gps1)
+    print "*** Test #3 complete.\n"
+
+    ######################################################################
+
+    print "\n*** Test #4: GPS removed while client still active."
+    print "**** Add a GPS.\n"
+    gps1 = test.gps_add("test/bu303-moving.log")
+
+    print "\n**** Add a client.\n"
+    c1 = test.client_add("w\n")
+    test.gather(3)
+    print "\n**** Remove the GPS."
     test.gps_remove(gps1)
-    print "*** Test #3 complete."
+    test.wait(3)
+    print "\n**** Remove the client.\n"
+    test.client_remove(c1)
 
+    print "*** Test #4 complete.\n"
     test.cleanup();
 finally:
     test.killall();