diff -r a29623b68ca2 -r 419a02fa70db tests/plover-gtk/test-transactionhelper.c --- a/tests/plover-gtk/test-transactionhelper.c Mon Jun 13 12:18:42 2016 +0100 +++ b/tests/plover-gtk/test-transactionhelper.c Thu Jun 16 12:11:14 2016 +0100 @@ -91,14 +91,19 @@ static void test_install_group(void) { - gchar *root; + gchar *root,*root_uri; GError *err=NULL; + GFile *file; PloverPackageSet *installed; PloverTransactionHelper *helper; root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); g_free(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); + g_free(root_uri); helper=get_transaction_helper(); installed=plover_package_set_new_from_installed("../razor-test-dir",&err); if (!installed) @@ -115,15 +120,20 @@ static void test_remove_group(void) { - gchar *root; + gchar *root,*root_uri; GError *err=NULL; + GFile *file; PloverPackageSet *installed; PloverTransactionHelper *helper; struct plover_vector *packages; char *pkgs[]={"zip",NULL}; root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); + g_free(root_uri); helper=get_transaction_helper(); plover_transaction_helper_set_base(helper,"../yum-repo-test-dir"); packages=plover_transaction_helper_group_get_default_packages(helper, @@ -148,14 +158,19 @@ static void test_update(void) { - gchar *root; + gchar *root,*root_uri; GError *err=NULL; + GFile *file; PloverPackageSet *installed; PloverTransactionHelper *helper; root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); g_free(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); + g_free(root_uri); helper=get_transaction_helper(); installed=plover_package_set_new_from_installed("../razor-test-dir",&err); if (!installed) @@ -239,15 +254,20 @@ static void test_run_install(void) { - gchar *root; + gchar *root,*root_uri; GError *err=NULL; + GFile *file; struct plover_vector *packages; PloverPackageSet *installed; PloverTransactionHelper *helper; struct run_install_baton baton={0,}; root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); + g_free(root_uri); helper=get_transaction_helper(); installed=plover_package_set_new(); if (!plover_package_set_open(installed,root,TRUE,&err)) @@ -339,15 +359,20 @@ static void test_run_remove(void) { - gchar *root; + gchar *root,*root_uri; GError *err=NULL; + GFile *file; struct plover_vector *packages; PloverPackageSet *installed; PloverTransactionHelper *helper; struct run_remove_baton baton={0,}; root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); + g_free(root_uri); helper=get_transaction_helper(); plover_transaction_helper_set_base(helper,"../yum-repo-test-dir"); packages= @@ -443,8 +468,9 @@ static void test_run_update(void) { - gchar *root; + gchar *root,*root_uri; GError *err=NULL; + GFile *file; struct razor_importer *importer; struct razor_set *downgraded; struct razor_atomic *atomic; @@ -454,7 +480,11 @@ struct run_update_baton baton={0,}; root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); + g_free(root_uri); helper=get_transaction_helper(); plover_transaction_helper_set_base(helper,"../yum-repo-test-dir"); installed=plover_package_set_new(); @@ -560,7 +590,8 @@ static void test_check_vendor(void) { int fh; - gchar *root,*s; + gchar *root,*root_uri,*s; + GFile *file; GError *err=NULL; struct razor_importer *importer; struct razor_set *downgraded; @@ -572,7 +603,10 @@ g_setenv("PLOVER_VENDOR_PREFIX","/srv",TRUE); root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); helper=get_transaction_helper(); plover_transaction_helper_set_check_vendor(helper,TRUE); plover_transaction_helper_set_base(helper,"../yum-repo-test-dir"); @@ -588,8 +622,8 @@ razor_importer_finish_package(importer); downgraded=razor_importer_finish(importer); atomic=razor_atomic_open("Add downgraded packages"); - razor_atomic_make_dirs(atomic,root,"/test/bin/zappy"); - s=g_build_filename(root,"test/bin/zappy",NULL); + razor_atomic_make_dirs(atomic,root_uri,"/test/bin/zappy"); + s=g_build_filename(root_uri,"test/bin/zappy",NULL); fh=razor_atomic_create_file(atomic,s,S_IRWXU|S_IRWXG|S_IRWXO); g_free(s); razor_atomic_close(atomic,fh); @@ -610,6 +644,7 @@ g_object_unref(helper); g_unsetenv("RAZOR_ROOT"); g_free(root); + g_free(root_uri); g_unsetenv("PLOVER_VENDOR_PREFIX"); } @@ -652,17 +687,22 @@ static void test_set_error(void) { - gchar *root; + gchar *root,*root_uri; const char *errmsg; GError *err=NULL; const GError *err2=NULL; + GFile *file; PloverPackageSet *installed; PloverTransactionHelper *helper; struct set_error_baton baton={0,}; root=g_strdup("razor-test-dir-XXXXXX"); g_assert(mkdtemp(root)); - g_setenv("RAZOR_ROOT",root,TRUE); + file=g_file_new_for_path(root); g_free(root); + root_uri=g_file_get_uri(file); + g_object_unref(file); + g_setenv("RAZOR_ROOT",root_uri,TRUE); + g_free(root_uri); helper=get_transaction_helper(); installed=plover_package_set_new_from_installed("../razor-test-dir",&err); if (!installed)