Skip to content

Commit

Permalink
tests/unit/test-image-locking: Fix handling of temporary files
Browse files Browse the repository at this point in the history
test-image-locking leaves some temporary files around - clean
them up. While we're at it, test-image-locking is a unit test,
so it should not use "qtest.*" for temporary file names. Give
them better names instead, so that it clear where the temporary
files come from.

Message-Id: <20221012085932.799221-1-thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
huth committed Oct 12, 2022
1 parent 969d1f6 commit 04c92d2
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tests/unit/test-image-locking.c
Expand Up @@ -79,7 +79,7 @@ static void test_image_locking_basic(void)
g_autofree char *img_path = NULL;
uint64_t perm, shared_perm;

int fd = g_file_open_tmp("qtest.XXXXXX", &img_path, NULL);
int fd = g_file_open_tmp("qemu-tst-img-lock.XXXXXX", &img_path, NULL);
assert(fd >= 0);

perm = BLK_PERM_WRITE | BLK_PERM_CONSISTENT_READ;
Expand Down Expand Up @@ -120,7 +120,7 @@ static void test_set_perm_abort(void)
g_autofree char *img_path = NULL;
uint64_t perm, shared_perm;
int r;
int fd = g_file_open_tmp("qtest.XXXXXX", &img_path, NULL);
int fd = g_file_open_tmp("qemu-tst-img-lock.XXXXXX", &img_path, NULL);
assert(fd >= 0);

perm = BLK_PERM_WRITE | BLK_PERM_CONSISTENT_READ;
Expand All @@ -140,6 +140,8 @@ static void test_set_perm_abort(void)
check_locked_bytes(fd, perm, ~shared_perm);
blk_unref(blk1);
blk_unref(blk2);
close(fd);
unlink(img_path);
}

int main(int argc, char **argv)
Expand Down

0 comments on commit 04c92d2

Please sign in to comment.