Index: /trunk/Nebulous/nebclient/tests/tests.c
===================================================================
--- /trunk/Nebulous/nebclient/tests/tests.c	(revision 12963)
+++ /trunk/Nebulous/nebclient/tests/tests.c	(revision 12964)
@@ -6,4 +6,10 @@
 #include "nebclient.h"
 #include "tap.h"
+
+#define neb_ok(server, val, ...) \
+    ok(val, __VA_ARGS__); \
+    if (!val) { \
+        diag("nebErr: %s", nebErr(server)); \
+    }
 
 int main (int argc, char **argv) {
@@ -28,7 +34,7 @@
         filename = nebCreate(server, key, 0, NULL, NULL, &URI);
 
-        ok(filename, "create object");
+        neb_ok(server, filename, "create object");
         ok(URI, "URI not NULL");
-        ok(nebDelete(server, key), "delete object");
+        neb_ok(server, nebDelete(server, key), "delete object");
 
         nebFree(URI);
@@ -42,5 +48,5 @@
         fh = nebOpenCreate(server, key, 0, NULL, NULL, &URI);
 
-        ok(fh > -1, "create new object filehandle");
+        neb_ok(server, fh > -1, "create new object filehandle");
         ok(URI, "URI not NULL");
 
@@ -54,5 +60,5 @@
         fh = nebOpen(server, key, NEB_READ);
 
-        ok(fh, "open object for reading");
+        neb_ok(server, fh, "open object for reading");
 
         close(fh);
@@ -64,5 +70,5 @@
         fh = nebOpen(server, key, NEB_WRITE);
 
-        ok(fh, "open object for writing");
+        neb_ok(server, fh, "open object for writing");
 
         close(fh);
@@ -70,17 +76,17 @@
 
 
-    ok(nebReplicate(server, key, NULL, NULL), "replicate object");
+    neb_ok(server, nebReplicate(server, key, NULL, NULL), "replicate object");
 
-    ok(nebOpen(server, key, NEB_WRITE) < 0, "write to object with multiple instances");
+    neb_ok(server, nebOpen(server, key, NEB_WRITE) < 0, "write to object with multiple instances");
 
-    ok(nebCull(server, key), "cull object");
+    neb_ok(server, nebCull(server, key), "cull object");
 
-    ok(nebStat(server, key), "stat object");
+    neb_ok(server, nebStat(server, key), "stat object");
 
-    ok(nebLock(server, key, NEB_WRITE), "lock object write");
-    ok(nebUnlock(server, key, NEB_WRITE), "unlock object write");
+    neb_ok(server, nebLock(server, key, NEB_WRITE), "lock object write");
+    neb_ok(server, nebUnlock(server, key, NEB_WRITE), "unlock object write");
 
-    ok(nebLock(server, key, NEB_READ), "lock object read");
-    ok(nebUnlock(server, key, NEB_READ), "unlock object read");
+    neb_ok(server, nebLock(server, key, NEB_READ), "lock object read");
+    neb_ok(server, nebUnlock(server, key, NEB_READ), "unlock object read");
 
     {
@@ -89,5 +95,5 @@
         locations = nebFindInstances(server, key, NULL);
 
-        ok(locations, "locations not NULL");
+        neb_ok(server, locations, "locations not NULL");
         ok(locations && locations->n == 1, "find instances");
 
@@ -100,5 +106,5 @@
         filename = nebFind(server, key);
 
-        ok(filename, "find file name");
+        neb_ok(server, filename, "find file name");
 
         nebFree(filename);
@@ -106,12 +112,12 @@
 
 
-    ok(nebCopy(server, key, "copyiedfile"), "copy object");
+    neb_ok(server, nebCopy(server, key, "copyiedfile"), "copy object");
 
-    ok(nebDelete(server, key), "delete object");
+    neb_ok(server, nebDelete(server, key), "delete object");
 
-    ok(nebMove(server, "copyiedfile", "movedfile"), "move object");
+    neb_ok(server, nebMove(server, "copyiedfile", "movedfile"), "move object");
 
     if (!nebDelete(server, "movedfile")) {
-        printf( "cleanup failed %s\n", nebErr(server));
+        diag( "cleanup failed %s\n", nebErr(server));
     }