Changeset 41172 for trunk/Nebulous/nebclient/tests/tests.c

Timestamp:

Nov 27, 2019, 12:04:14 PM (7 years ago)

Author:

eugene

Message:

merging updates to Nebulous from EAM dev branch ipp-20191011

Location:

trunk/Nebulous/nebclient

Files:

• . (modified) (1 prop)
• tests/tests.c (modified) (4 diffs)

trunk/Nebulous/nebclient

@@ -21 +21 @@
 stamp-h1
 test-driver
+INSTALL
+COPYING

@@ -21 +21 @@
 stamp-h1
 test-driver
+INSTALL
+COPYING

trunk/Nebulous/nebclient/tests/tests.c

@@ -16 +16 @@
     if (foo) nebFree(foo)
 
+int show_instances (nebServer *server, char *key) {
+
+  nebObjectInstances *locations = NULL;
+
+  locations = nebFindInstances(server, key, NULL);
+
+  for (int i = 0; i < locations->n; i++) {
+    fprintf (stderr, "# loc %d : %s\n", i, locations->URI[i]);
+  }
+  nebObjectInstancesFree(locations);
+  return 1;
+}
+
+int count_instances (nebServer *server, char *key) {
+
+  nebObjectInstances *locations = NULL;
+  locations = nebFindInstances(server, key, NULL);
+  int Ninstances = locations ? locations->n : 0;
+  nebObjectInstancesFree(locations);
+  return Ninstances;
+}
+
 int main (int argc, char **argv) {
     nebServer       *server = NULL;
     char            *key = "foobarbaz";
 
-    plan_tests(31);
+    plan_tests(37);
 
     if (getenv("NEB_SERVER")) {
@@ -37 +59 @@
         filename = nebCreate(server, key, NULL, &URI);
         diag("filename is %s", filename);
+
+        if (!filename) {
+          fprintf (stdout, "not ok: no files in test server, exiting\n");
+          exit (2);
+        }
+
+        show_instances (server, key);
+        ok (count_instances (server, key) == 1, "correct instance count"); 
+
         neb_ok(server, filename, "create object");
         ok(URI, "URI not NULL");
@@ -53 +84 @@
         neb_ok(server, fh > -1, "create new object filehandle");
         ok(URI, "URI not NULL");
+        ok (count_instances (server, key) == 1, "correct instance count"); 
 
         tst_nebFree(URI);
         close(fh);
     }
+
+    show_instances (server, key);
 
     {
@@ -80 +114 @@
     }
 
-
     neb_ok(server, nebReplicate(server, key, NULL, NULL), "replicate object");
+    show_instances (server, key);
+    ok (count_instances (server, key) == 2, "correct instance count"); 
 
     neb_ok(server, nebOpen(server, key, NEB_WRITE) < 0, "write to object with multiple instances");
+    show_instances (server, key);
 
     neb_ok(server, nebCull(server, key), "cull object");
+    show_instances (server, key);
+    ok (count_instances (server, key) == 1, "correct instance count"); 
+
+    neb_ok(server, nebCull(server, key) == 0, "cannot cull object with one instance");
+    show_instances (server, key);
+    ok (count_instances (server, key) == 1, "correct instance count"); 
 
     neb_ok(server, nebStat(server, key), "stat object");
+    show_instances (server, key);
 
     neb_ok(server, nebLock(server, key, NEB_WRITE), "lock object write");

@@ -21 +21 @@
 stamp-h1
 test-driver
+INSTALL
+COPYING