Changeset 3280

Show
Ignore:
Timestamp:
04/19/08 16:11:44 (3 months ago)
Author:
dgollub
Message:

Make us of recently introduced osync_testing_file_* helpers to avoid
portabilitiy problems. Avoid system() calls - even in tests.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tests/ipc-tests/check_ipc.c

    r3047 r3280  
    33 
    44#include <opensync/opensync-ipc.h> 
    5  
    6 void _remove_pipe(const char *name) 
    7 { 
    8         char *cmd = g_strdup_printf("rm %s &> /dev/null", name); 
    9         system(cmd); 
    10         g_free(cmd); 
    11 } 
    125 
    136START_TEST (ipc_new) 
    147{ 
    158        char *testbed = setup_testbed(NULL); 
    16         _remove_pipe("/tmp/testpipe"); 
     9        osync_testing_file_remove("/tmp/testpipe"); 
    1710         
    1811        OSyncError *error = NULL; 
    …… 
    3023{ 
    3124        char *testbed = setup_testbed(NULL); 
    32         _remove_pipe("/tmp/testpipe"); 
     25        osync_testing_file_remove("/tmp/testpipe"); 
    3326         
    3427        OSyncError *error = NULL; 
    …… 
    4033        fail_unless(error == NULL, NULL); 
    4134         
    42         fail_unless(system("ls /tmp/testpipe &> /dev/null") == 0, NULL); 
     35        fail_unless(osync_testing_file_exists("/tmp/testpipe") == TRUE, NULL); 
    4336         
    4437        fail_unless(osync_queue_remove(queue1, &error), NULL); 
    4538        fail_unless(error == NULL, NULL); 
    4639         
    47         fail_unless(system("ls /tmp/testpipe &> /dev/null") != 0, NULL); 
     40        fail_unless(osync_testing_file_exists("/tmp/testpipe") == FALSE, NULL); 
    4841         
    4942        osync_queue_free(queue1); 
    …… 
    5649{ 
    5750        char *testbed = setup_testbed(NULL); 
    58         _remove_pipe("/tmp/testpipe"); 
     51        osync_testing_file_remove("/tmp/testpipe"); 
    5952         
    6053        OSyncError *error = NULL; 
    …… 
    8982        } 
    9083         
    91         fail_unless(system("ls /tmp/testpipe &> /dev/null") == 0, NULL); 
     84        fail_unless(osync_testing_file_exists("/tmp/testpipe") == TRUE, NULL); 
    9285                 
    9386        fail_unless(osync_queue_remove(queue, &error), NULL); 
    9487        fail_unless(error == NULL, NULL); 
    9588         
    96         fail_unless(system("ls /tmp/testpipe &> /dev/null") != 0, NULL); 
     89        fail_unless(osync_testing_file_exists("/tmp/testpipe") == FALSE, NULL); 
    9790 
    9891        osync_queue_free(queue); 
    …… 
    10598{        
    10699        char *testbed = setup_testbed(NULL); 
    107         _remove_pipe("/tmp/testpipe-server"); 
    108         _remove_pipe("/tmp/testpipe-client"); 
     100        osync_testing_file_remove("/tmp/testpipe-server"); 
     101        osync_testing_file_remove("/tmp/testpipe-client"); 
    109102         
    110103        OSyncError *error = NULL; 
    …… 
    225218        } 
    226219         
    227         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     220        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    228221         
    229222        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    231224        fail_unless(!osync_error_is_set(&error), NULL); 
    232225         
    233         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     226        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    234227 
    235228        osync_queue_free(client_queue); 
    …… 
    243236{        
    244237        char *testbed = setup_testbed(NULL); 
    245         _remove_pipe("/tmp/testpipe-server"); 
    246         _remove_pipe("/tmp/testpipe-client"); 
     238        osync_testing_file_remove("/tmp/testpipe-server"); 
     239        osync_testing_file_remove("/tmp/testpipe-client"); 
    247240         
    248241        OSyncError *error = NULL; 
    …… 
    373366        } 
    374367         
    375         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     368        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    376369         
    377370        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    379372        fail_unless(!osync_error_is_set(&error), NULL); 
    380373         
    381         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     374        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    382375 
    383376        osync_queue_free(client_queue); 
    …… 
    391384{        
    392385        char *testbed = setup_testbed(NULL); 
    393         _remove_pipe("/tmp/testpipe-server"); 
    394         _remove_pipe("/tmp/testpipe-client"); 
     386        osync_testing_file_remove("/tmp/testpipe-server"); 
     387        osync_testing_file_remove("/tmp/testpipe-client"); 
    395388         
    396389        int num_mess = 1000; 
    …… 
    517510        } 
    518511         
    519         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     512        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    520513         
    521514        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    523516        fail_unless(!osync_error_is_set(&error), NULL); 
    524517         
    525         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     518        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    526519 
    527520        osync_queue_free(client_queue); 
    …… 
    536529{        
    537530        char *testbed = setup_testbed(NULL); 
    538         _remove_pipe("/tmp/testpipe-server"); 
    539         _remove_pipe("/tmp/testpipe-client"); 
     531        osync_testing_file_remove("/tmp/testpipe-server"); 
     532        osync_testing_file_remove("/tmp/testpipe-client"); 
    540533        int i = 0; 
    541534         
    …… 
    660653        } 
    661654         
    662         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     655        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    663656         
    664657        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    666659        fail_unless(!osync_error_is_set(&error), NULL); 
    667660         
    668         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     661        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    669662 
    670663        osync_queue_free(client_queue); 
    …… 
    679672{        
    680673        char *testbed = setup_testbed(NULL); 
    681         _remove_pipe("/tmp/testpipe-server"); 
    682         _remove_pipe("/tmp/testpipe-client"); 
     674        osync_testing_file_remove("/tmp/testpipe-server"); 
     675        osync_testing_file_remove("/tmp/testpipe-client"); 
    683676        int i = 0; 
    684677         
    …… 
    796789        } 
    797790         
    798         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     791        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    799792         
    800793        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    802795        fail_unless(!osync_error_is_set(&error), NULL); 
    803796         
    804         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     797        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    805798 
    806799        osync_queue_free(client_queue); 
    …… 
    815808{ 
    816809        char *testbed = setup_testbed(NULL); 
    817         _remove_pipe("/tmp/testpipe"); 
     810        osync_testing_file_remove("/tmp/testpipe"); 
    818811         
    819812        OSyncError *error = NULL; 
    …… 
    835828{ 
    836829        char *testbed = setup_testbed(NULL); 
    837         _remove_pipe("/tmp/testpipe"); 
     830        osync_testing_file_remove("/tmp/testpipe"); 
    838831         
    839832        OSyncError *error = NULL; 
    …… 
    850843        osync_error_unref(&error); 
    851844         
    852         fail_unless(system("ls /tmp/testpipe &> /dev/null") == 0, NULL); 
     845        fail_unless(osync_testing_file_exists("/tmp/testpipe") == TRUE, NULL); 
    853846                 
    854847        fail_unless(osync_queue_remove(queue, &error), NULL); 
    855848        fail_unless(error == NULL, NULL); 
    856849         
    857         fail_unless(system("ls /tmp/testpipe &> /dev/null") != 0, NULL); 
     850        fail_unless(osync_testing_file_exists("/tmp/testpipe") == FALSE, NULL); 
    858851 
    859852        osync_queue_free(queue); 
    …… 
    866859{        
    867860        char *testbed = setup_testbed(NULL); 
    868         _remove_pipe("/tmp/testpipe"); 
     861        osync_testing_file_remove("/tmp/testpipe"); 
    869862         
    870863        OSyncError *error = NULL; 
    …… 
    898891        } 
    899892         
    900         fail_unless(system("ls /tmp/testpipe &> /dev/null") == 0, NULL); 
     893        fail_unless(osync_testing_file_exists("/tmp/testpipe") == TRUE, NULL); 
    901894         
    902895        fail_unless(osync_queue_remove(server_queue, &error), NULL); 
    903896        fail_unless(!osync_error_is_set(&error), NULL); 
    904897         
    905         fail_unless(system("ls /tmp/testpipe &> /dev/null") != 0, NULL); 
     898        fail_unless(osync_testing_file_exists("/tmp/testpipe") == FALSE, NULL); 
    906899 
    907900        osync_queue_free(server_queue); 
    …… 
    914907{        
    915908        char *testbed = setup_testbed(NULL); 
    916         _remove_pipe("/tmp/testpipe"); 
     909        osync_testing_file_remove("/tmp/testpipe"); 
    917910         
    918911        OSyncError *error = NULL; 
    …… 
    975968        } 
    976969         
    977         fail_unless(system("ls /tmp/testpipe &> /dev/null") == 0, NULL); 
     970        fail_unless(osync_testing_file_exists("/tmp/testpipe") == TRUE, NULL); 
    978971         
    979972        fail_unless(osync_queue_remove(server_queue, &error), NULL); 
    980973        fail_unless(!osync_error_is_set(&error), NULL); 
    981974         
    982         fail_unless(system("ls /tmp/testpipe &> /dev/null") != 0, NULL); 
     975        fail_unless(osync_testing_file_exists("/tmp/testpipe") == FALSE, NULL); 
    983976 
    984977        osync_queue_free(server_queue); 
    …… 
    10411034{        
    10421035        char *testbed = setup_testbed(NULL); 
    1043         _remove_pipe("/tmp/testpipe-server"); 
    1044         _remove_pipe("/tmp/testpipe-client"); 
     1036        osync_testing_file_remove("/tmp/testpipe-server"); 
     1037        osync_testing_file_remove("/tmp/testpipe-client"); 
    10451038         
    10461039        OSyncError *error = NULL; 
    …… 
    11401133        } 
    11411134         
    1142         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     1135        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    11431136         
    11441137        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    11461139        fail_unless(!osync_error_is_set(&error), NULL); 
    11471140         
    1148         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     1141        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    11491142 
    11501143        osync_queue_free(client_queue); 
    …… 
    12261219{        
    12271220        char *testbed = setup_testbed(NULL); 
    1228         _remove_pipe("/tmp/testpipe-server"); 
    1229         _remove_pipe("/tmp/testpipe-client"); 
     1221        osync_testing_file_remove("/tmp/testpipe-server"); 
     1222        osync_testing_file_remove("/tmp/testpipe-client"); 
    12301223         
    12311224        OSyncError *error = NULL; 
    …… 
    13291322        } 
    13301323         
    1331         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     1324        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    13321325         
    13331326        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    13351328        fail_unless(!osync_error_is_set(&error), NULL); 
    13361329         
    1337         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     1330        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    13381331 
    13391332        osync_queue_free(client_queue); 
    …… 
    14041397         
    14051398        char *testbed = setup_testbed(NULL); 
    1406         _remove_pipe("/tmp/testpipe-server"); 
    1407         _remove_pipe("/tmp/testpipe-client"); 
     1399        osync_testing_file_remove("/tmp/testpipe-server"); 
     1400        osync_testing_file_remove("/tmp/testpipe-client"); 
    14081401         
    14091402        OSyncError *error = NULL; 
    …… 
    15121505        } 
    15131506         
    1514         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     1507        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    15151508         
    15161509        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    15181511        fail_unless(!osync_error_is_set(&error), NULL); 
    15191512         
    1520         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     1513        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    15211514 
    15221515        osync_queue_free(client_queue); 
    …… 
    15981591         
    15991592        char *testbed = setup_testbed(NULL); 
    1600         _remove_pipe("/tmp/testpipe-server"); 
    1601         _remove_pipe("/tmp/testpipe-client"); 
     1593        osync_testing_file_remove("/tmp/testpipe-server"); 
     1594        osync_testing_file_remove("/tmp/testpipe-client"); 
    16021595         
    16031596        OSyncError *error = NULL; 
    …… 
    17011694        } 
    17021695         
    1703         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     1696        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    17041697         
    17051698        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    17071700        fail_unless(!osync_error_is_set(&error), NULL); 
    17081701         
    1709         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     1702        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    17101703 
    17111704        osync_queue_free(client_queue); 
    …… 
    20862079 
    20872080        char *testbed = setup_testbed(NULL); 
    2088         _remove_pipe("/tmp/testpipe-server"); 
    2089         _remove_pipe("/tmp/testpipe-client"); 
     2081        osync_testing_file_remove("/tmp/testpipe-server"); 
     2082        osync_testing_file_remove("/tmp/testpipe-client"); 
    20902083 
    20912084        num_callback_timeout = 0; 
    …… 
    22252218        } 
    22262219         
    2227         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") == 0, NULL); 
     2220        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == TRUE, NULL); 
    22282221         
    22292222        fail_unless(osync_queue_remove(client_queue, &error), NULL); 
    …… 
    22352228        fail_unless(num_callback == 0, NULL); 
    22362229         
    2237         fail_unless(system("ls /tmp/testpipe-client &> /dev/null") != 0, NULL); 
     2230        fail_unless(osync_testing_file_exists("/tmp/testpipe-client") == FALSE, NULL); 
    22382231 
    22392232        osync_queue_free(client_queue);