archive: Slightly refactor extraction and filelist test

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c
index d179fde2ed058870cf624744f41ff97ecd5bbbf2..14a0fc83171832cc29aff8679c43c1b7bc82cabd 100644 (file)
--- 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));