[gcr] tests: fix collection tests to work with gpg 2.1

[Stefan Walter <stefw src gnome org>]

commit a861934cb4dcce3b215893ed8ed704ca8321000f
Author: Andreas Henriksson <andreas fatal se>
Date:   Sun Oct 9 12:15:50 2016 +0200

    tests: fix collection tests to work with gpg 2.1
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771052
    
    Signed-off-by: Stef Walter <stefw redhat com>
     * Fixed whitespace

 gcr/test-gnupg-collection.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/gcr/test-gnupg-collection.c b/gcr/test-gnupg-collection.c
index 7aed48c..e8b9cba 100644
--- a/gcr/test-gnupg-collection.c
+++ b/gcr/test-gnupg-collection.c
@@ -115,6 +115,14 @@ teardown (Test *test, gconstpointer unused)
 
        g_object_unref (test->collection);
 
+        /* remove potential gpg 2.1 extras, ignore any errors. */
+        cmd = g_strdup_printf ("rm -rf %s/*.d", test->directory);
+        system (cmd);
+        g_free (cmd);
+        cmd = g_strdup_printf ("rm -f %s/.gpg-v21-migrated", test->directory);
+        system (cmd);
+        g_free (cmd);
+
        cmd = g_strdup_printf ("rm -f %s/*", test->directory);
        g_spawn_check_exit_status (system (cmd), &error);
        g_assert_no_error (error);
@@ -202,7 +210,7 @@ test_reload (Test *test, gconstpointer unused)
        GcrGnupgKey *key;
 
        _gcr_gnupg_collection_load_async (test->collection, NULL, on_async_ready, test);
-       egg_test_wait_until (500);
+       egg_test_wait_until (2500);
        g_assert (test->result);
        _gcr_gnupg_collection_load_finish (test->collection, test->result, &error);
        g_assert_no_error (error);