Changeset 3361

Show
Ignore:
Timestamp:
06/13/08 18:56:59 (4 months ago)
Author:
dgollub
Message:

Replace fail_unless() calls with osync_assert() to make mock-sync
independent of the check testing framework.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tests/mock-plugin/mock_sync.c

    r3360 r3361  
    133133                        MockDir *sink_dir = o->data; 
    134134                        if (!g_getenv("NO_COMMITTED_ALL_CHECK")) 
    135                                 fail_unless(sink_dir->committed_all == TRUE, NULL); 
     135                                osync_assert(sink_dir->committed_all == TRUE); 
    136136 
    137137                        sink_dir->committed_all = FALSE; 
    …… 
    139139        } else { 
    140140                if (!g_getenv("NO_COMMITTED_ALL_CHECK")) 
    141                         fail_unless(dir->committed_all == TRUE, NULL); 
     141                        osync_assert(dir->committed_all == TRUE); 
    142142 
    143143                dir->committed_all = FALSE; 
    …… 
    355355        OSyncError *error = NULL; 
    356356 
    357         fail_unless(dir->committed_all == TRUE, NULL); 
     357        osync_assert(dir->committed_all == TRUE); 
    358358        dir->committed_all = FALSE; 
    359359 
    …… 
    374374        if (osync_objtype_sink_get_slowsync(dir->sink)) { 
    375375                osync_trace(TRACE_INTERNAL, "Slow sync requested"); 
    376                 fail_unless(osync_hashtable_slowsync(dir->hashtable, &error), NULL); 
     376                osync_assert(osync_hashtable_slowsync(dir->hashtable, &error)); 
    377377        } 
    378378         
    …… 
    417417        char *filename = NULL; 
    418418 
    419         fail_unless(dir->committed_all == FALSE, NULL); 
     419        osync_assert(dir->committed_all == FALSE); 
    420420 
    421421        if (mock_get_error(info->memberid, "COMMIT_ERROR")) { 
    …… 
    459459        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    460460 
    461         fail_unless(dir->committed_all == FALSE, NULL); 
     461        osync_assert(dir->committed_all == FALSE); 
    462462        dir->committed_all = TRUE; 
    463463 
    …… 
    483483        if (g_getenv("NUM_BATCH_COMMITS")) { 
    484484                int req = atoi(g_getenv("NUM_BATCH_COMMITS")); 
    485                 fail_unless(req == i, NULL); 
     485                osync_assert(req == i); 
    486486        } 
    487487                 
    …… 
    502502        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    503503 
    504         fail_unless(dir->committed_all == FALSE, NULL); 
     504        osync_assert(dir->committed_all == FALSE); 
    505505        dir->committed_all = TRUE; 
    506506