Use cut_omit() in tests setup() fixtures (requires cutter>=1.1.2).

This commit is contained in:
Romain Tartiere 2010-04-08 12:10:42 +00:00
parent 18f84ceb7a
commit c9df81d96c
2 changed files with 8 additions and 4 deletions

View file

@ -30,7 +30,8 @@ setup ()
int res; int res;
device = nfc_connect (NULL); device = nfc_connect (NULL);
cut_assert_not_null (device, cut_message ("No device found")); if (!device)
cut_omit ("No device found");
tags = freefare_get_tags (device); tags = freefare_get_tags (device);
cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed")); cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed"));
@ -44,7 +45,8 @@ setup ()
} }
} }
cut_assert_not_null (tag, cut_message ("No MIFARE Classic tag on NFC device")); if (!tag)
cut_omit ("No MIFARE Classic tag on NFC device");
res = mifare_classic_connect (tag); res = mifare_classic_connect (tag);
cut_assert_equal_int (0, res, cut_message ("mifare_classic_connect() failed")); cut_assert_equal_int (0, res, cut_message ("mifare_classic_connect() failed"));

View file

@ -30,7 +30,8 @@ setup ()
int res; int res;
device = nfc_connect (NULL); device = nfc_connect (NULL);
cut_assert_not_null (device, cut_message ("No device found")); if (!device)
cut_omit ("No device found");
tags = freefare_get_tags (device); tags = freefare_get_tags (device);
cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed")); cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed"));
@ -43,7 +44,8 @@ setup ()
} }
} }
cut_assert_not_null (tag, cut_message ("No MIFARE UltraLight tag on NFC device")); if (!tag)
cut_omit ("No MIFARE UltraLight tag on NFC device");
res = mifare_ultralight_connect (tag); res = mifare_ultralight_connect (tag);
cut_assert_equal_int (0, res, cut_message ("mifare_ultralight_connect() failed")); cut_assert_equal_int (0, res, cut_message ("mifare_ultralight_connect() failed"));