IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
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:
1 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Nebulous/nebclient

    • Property svn:ignore

      •  

        old new  
        2121stamp-h1
        2222test-driver
         23INSTALL
         24COPYING

  • trunk/Nebulous/nebclient/tests/tap

    • Property svn:ignore

      •  

        old new  
        1919src/.deps
        2020src/Makefile
         21INSTALL
         22COPYING

  • trunk/Nebulous/nebclient/tests/tests.c

    r24999 r41172  
    1616    if (foo) nebFree(foo)
    1717
     18int show_instances (nebServer *server, char *key) {
     19
     20  nebObjectInstances *locations = NULL;
     21
     22  locations = nebFindInstances(server, key, NULL);
     23
     24  for (int i = 0; i < locations->n; i++) {
     25    fprintf (stderr, "# loc %d : %s\n", i, locations->URI[i]);
     26  }
     27  nebObjectInstancesFree(locations);
     28  return 1;
     29}
     30
     31int count_instances (nebServer *server, char *key) {
     32
     33  nebObjectInstances *locations = NULL;
     34  locations = nebFindInstances(server, key, NULL);
     35  int Ninstances = locations ? locations->n : 0;
     36  nebObjectInstancesFree(locations);
     37  return Ninstances;
     38}
     39
    1840int main (int argc, char **argv) {
    1941    nebServer       *server = NULL;
    2042    char            *key = "foobarbaz";
    2143
    22     plan_tests(31);
     44    plan_tests(37);
    2345
    2446    if (getenv("NEB_SERVER")) {
    … …  
    3759        filename = nebCreate(server, key, NULL, &URI);
    3860        diag("filename is %s", filename);
     61
     62        if (!filename) {
     63          fprintf (stdout, "not ok: no files in test server, exiting\n");
     64          exit (2);
     65        }
     66
     67        show_instances (server, key);
     68        ok (count_instances (server, key) == 1, "correct instance count");
     69
    3970        neb_ok(server, filename, "create object");
    4071        ok(URI, "URI not NULL");
    … …  
    5384        neb_ok(server, fh > -1, "create new object filehandle");
    5485        ok(URI, "URI not NULL");
     86        ok (count_instances (server, key) == 1, "correct instance count");
    5587
    5688        tst_nebFree(URI);
    5789        close(fh);
    5890    }
     91
     92    show_instances (server, key);
    5993
    6094    {
    … …  
    80114    }
    81115
    82 
    83116    neb_ok(server, nebReplicate(server, key, NULL, NULL), "replicate object");
     117    show_instances (server, key);
     118    ok (count_instances (server, key) == 2, "correct instance count");
    84119
    85120    neb_ok(server, nebOpen(server, key, NEB_WRITE) < 0, "write to object with multiple instances");
     121    show_instances (server, key);
    86122
    87123    neb_ok(server, nebCull(server, key), "cull object");
     124    show_instances (server, key);
     125    ok (count_instances (server, key) == 1, "correct instance count");
     126
     127    neb_ok(server, nebCull(server, key) == 0, "cannot cull object with one instance");
     128    show_instances (server, key);
     129    ok (count_instances (server, key) == 1, "correct instance count");
    88130
    89131    neb_ok(server, nebStat(server, key), "stat object");
     132    show_instances (server, key);
    90133
    91134    neb_ok(server, nebLock(server, key, NEB_WRITE), "lock object write");
Note: See TracChangeset for help on using the changeset viewer.