From: Michael Tremer Date: Sat, 20 Nov 2021 16:14:27 +0000 (+0000) Subject: archive: Slightly refactor extraction and filelist test X-Git-Tag: 0.9.28~868 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ed9adbe818cad52987e036cec07492fb1efc8a;p=pakfire.git archive: Slightly refactor extraction and filelist test Signed-off-by: Michael Tremer --- diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c index d179fde2e..14a0fc831 100644 --- a/tests/libpakfire/archive.c +++ b/tests/libpakfire/archive.c @@ -187,18 +187,15 @@ FAIL: } static int test_filelist(const struct test* t) { - const char* path = TEST_SRC_PATH TEST_PKG1_PATH; - int r = EXIT_FAILURE; - struct pakfire_archive* archive = NULL; struct pakfire_filelist* list = NULL; + int r = EXIT_FAILURE; // Open the archive - ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path)); + ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, TEST_SRC_PATH TEST_PKG1_PATH)); // Fetch the filelist - list = pakfire_archive_get_filelist(archive); - ASSERT(list); + ASSERT(list = pakfire_archive_get_filelist(archive)); // This packages has 7 files ASSERT(pakfire_filelist_size(list) == 7); @@ -216,12 +213,10 @@ FAIL: } static int test_extract(const struct test* t) { - const char* path = TEST_SRC_PATH TEST_PKG1_PATH; - int r = EXIT_FAILURE; - struct pakfire_archive* archive = NULL; + int r = EXIT_FAILURE; - ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path)); + ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, TEST_SRC_PATH TEST_PKG1_PATH)); // Extract the archive payload ASSERT_SUCCESS(pakfire_archive_extract(archive, NULL));