[libdazzle] tests: always reap files before test



commit 62f9c41a9a156697f8fcc48aaadcc7965d1177a5
Author: Christian Hergert <chergert redhat com>
Date:   Sun Dec 3 04:03:36 2017 -0800

    tests: always reap files before test

 tests/test-file-transfer.c |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/tests/test-file-transfer.c b/tests/test-file-transfer.c
index b950caa..9893a2e 100644
--- a/tests/test-file-transfer.c
+++ b/tests/test-file-transfer.c
@@ -20,26 +20,20 @@ write_file (const gchar *path)
 static void
 test_basic (void)
 {
-  g_autoptr(DzlFileTransfer) xfer = NULL;
+  g_autoptr(DzlFileTransfer) xfer = dzl_file_transfer_new ();
   g_autoptr(GFile) root = g_file_new_for_path ("test-file-transfer-data");
   g_autoptr(GFile) copy = g_file_new_for_path ("test-file-transfer-copy");
   g_autoptr(GError) error = NULL;
+  g_autoptr(DzlDirectoryReaper) reaper = dzl_directory_reaper_new ();
   gboolean r;
 
-  xfer = dzl_file_transfer_new ();
-
-  if (g_file_query_exists (root, NULL))
-    {
-      g_autoptr(DzlDirectoryReaper) reaper = dzl_directory_reaper_new ();
-
-      dzl_directory_reaper_add_directory (reaper, root, 0);
-      dzl_directory_reaper_add_directory (reaper, copy, 0);
-      dzl_directory_reaper_add_file (reaper, root, 0);
-      dzl_directory_reaper_add_file (reaper, copy, 0);
-      dzl_directory_reaper_execute (reaper, NULL, NULL);
-
-      g_assert (!g_file_query_exists (root, NULL));
-    }
+  dzl_directory_reaper_add_directory (reaper, root, 0);
+  dzl_directory_reaper_add_directory (reaper, copy, 0);
+  dzl_directory_reaper_add_file (reaper, root, 0);
+  dzl_directory_reaper_add_file (reaper, copy, 0);
+  dzl_directory_reaper_execute (reaper, NULL, NULL);
+  g_assert (!g_file_query_exists (root, NULL));
+  g_assert (!g_file_query_exists (copy, NULL));
 
   g_assert_cmpint (0, ==, g_mkdir ("test-file-transfer-data", 0750));
   g_assert_cmpint (0, ==, g_mkdir ("test-file-transfer-data/a", 0750));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]