From 1158ba453ea9f5d4d6179df7b2a0880793dfd9cb Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 12 Feb 2019 14:54:56 +0100 Subject: [PATCH] Use better test for a bad loop descriptor. --- tests/api-test-2.c | 2 +- tests/api-test.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/api-test-2.c b/tests/api-test-2.c index b087335a..2842d862 100644 --- a/tests/api-test-2.c +++ b/tests/api-test-2.c @@ -1282,8 +1282,8 @@ static void Luks2HeaderBackup(void) // exercise luksOpen using backup header on block device fd = loop_attach(&DEVICE_3, BACKUP_FILE, 0, 0, &ro); + NOTFAIL_(fd, "Bad loop device."); close(fd); - OK_(fd < 0); OK_(crypt_init(&cd, DEVICE_3)); OK_(crypt_load(cd, CRYPT_LUKS2, NULL)); OK_(crypt_set_data_device(cd, DMDIR L_DEVICE_OK)); diff --git a/tests/api-test.c b/tests/api-test.c index e41e48e9..53e716ed 100644 --- a/tests/api-test.c +++ b/tests/api-test.c @@ -527,8 +527,8 @@ static void AddDevicePlain(void) EQ_(r_size>>SECTOR_SHIFT, params.size + 10); EQ_(crypt_status(cd,CDEVICE_1),CRYPT_ACTIVE); fd = open(path, O_RDONLY); + NOTFAIL_(fd, "Bad loop device."); close(fd); - OK_(fd < 0); // resize to minimal size OK_(crypt_resize(cd,CDEVICE_1, 1)); // minimal device size @@ -1312,8 +1312,8 @@ static void LuksHeaderBackup(void) // exercise luksOpen using backup header on block device fd = loop_attach(&DEVICE_3, BACKUP_FILE, 0, 0, &ro); + NOTFAIL_(fd, "Bad loop device."); close(fd); - OK_(fd < 0); OK_(crypt_init(&cd, DEVICE_3)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); OK_(crypt_set_data_device(cd, DMDIR L_DEVICE_OK));