1.1 --- a/tests/plover-gtk/test-transactionhelper.c Mon Jun 13 12:18:42 2016 +0100
1.2 +++ b/tests/plover-gtk/test-transactionhelper.c Tue Jul 05 13:02:45 2016 +0100
1.3 @@ -91,14 +91,19 @@
1.4
1.5 static void test_install_group(void)
1.6 {
1.7 - gchar *root;
1.8 + gchar *root,*root_uri;
1.9 GError *err=NULL;
1.10 + GFile *file;
1.11 PloverPackageSet *installed;
1.12 PloverTransactionHelper *helper;
1.13 root=g_strdup("razor-test-dir-XXXXXX");
1.14 g_assert(mkdtemp(root));
1.15 - g_setenv("RAZOR_ROOT",root,TRUE);
1.16 + file=g_file_new_for_path(root);
1.17 g_free(root);
1.18 + root_uri=g_file_get_uri(file);
1.19 + g_object_unref(file);
1.20 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.21 + g_free(root_uri);
1.22 helper=get_transaction_helper();
1.23 installed=plover_package_set_new_from_installed("../razor-test-dir",&err);
1.24 if (!installed)
1.25 @@ -115,15 +120,20 @@
1.26
1.27 static void test_remove_group(void)
1.28 {
1.29 - gchar *root;
1.30 + gchar *root,*root_uri;
1.31 GError *err=NULL;
1.32 + GFile *file;
1.33 PloverPackageSet *installed;
1.34 PloverTransactionHelper *helper;
1.35 struct plover_vector *packages;
1.36 char *pkgs[]={"zip",NULL};
1.37 root=g_strdup("razor-test-dir-XXXXXX");
1.38 g_assert(mkdtemp(root));
1.39 - g_setenv("RAZOR_ROOT",root,TRUE);
1.40 + file=g_file_new_for_path(root);
1.41 + root_uri=g_file_get_uri(file);
1.42 + g_object_unref(file);
1.43 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.44 + g_free(root_uri);
1.45 helper=get_transaction_helper();
1.46 plover_transaction_helper_set_base(helper,"../yum-repo-test-dir");
1.47 packages=plover_transaction_helper_group_get_default_packages(helper,
1.48 @@ -148,14 +158,19 @@
1.49
1.50 static void test_update(void)
1.51 {
1.52 - gchar *root;
1.53 + gchar *root,*root_uri;
1.54 GError *err=NULL;
1.55 + GFile *file;
1.56 PloverPackageSet *installed;
1.57 PloverTransactionHelper *helper;
1.58 root=g_strdup("razor-test-dir-XXXXXX");
1.59 g_assert(mkdtemp(root));
1.60 - g_setenv("RAZOR_ROOT",root,TRUE);
1.61 + file=g_file_new_for_path(root);
1.62 g_free(root);
1.63 + root_uri=g_file_get_uri(file);
1.64 + g_object_unref(file);
1.65 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.66 + g_free(root_uri);
1.67 helper=get_transaction_helper();
1.68 installed=plover_package_set_new_from_installed("../razor-test-dir",&err);
1.69 if (!installed)
1.70 @@ -239,15 +254,20 @@
1.71
1.72 static void test_run_install(void)
1.73 {
1.74 - gchar *root;
1.75 + gchar *root,*root_uri;
1.76 GError *err=NULL;
1.77 + GFile *file;
1.78 struct plover_vector *packages;
1.79 PloverPackageSet *installed;
1.80 PloverTransactionHelper *helper;
1.81 struct run_install_baton baton={0,};
1.82 root=g_strdup("razor-test-dir-XXXXXX");
1.83 g_assert(mkdtemp(root));
1.84 - g_setenv("RAZOR_ROOT",root,TRUE);
1.85 + file=g_file_new_for_path(root);
1.86 + root_uri=g_file_get_uri(file);
1.87 + g_object_unref(file);
1.88 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.89 + g_free(root_uri);
1.90 helper=get_transaction_helper();
1.91 installed=plover_package_set_new();
1.92 if (!plover_package_set_open(installed,root,TRUE,&err))
1.93 @@ -339,15 +359,20 @@
1.94
1.95 static void test_run_remove(void)
1.96 {
1.97 - gchar *root;
1.98 + gchar *root,*root_uri;
1.99 GError *err=NULL;
1.100 + GFile *file;
1.101 struct plover_vector *packages;
1.102 PloverPackageSet *installed;
1.103 PloverTransactionHelper *helper;
1.104 struct run_remove_baton baton={0,};
1.105 root=g_strdup("razor-test-dir-XXXXXX");
1.106 g_assert(mkdtemp(root));
1.107 - g_setenv("RAZOR_ROOT",root,TRUE);
1.108 + file=g_file_new_for_path(root);
1.109 + root_uri=g_file_get_uri(file);
1.110 + g_object_unref(file);
1.111 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.112 + g_free(root_uri);
1.113 helper=get_transaction_helper();
1.114 plover_transaction_helper_set_base(helper,"../yum-repo-test-dir");
1.115 packages=
1.116 @@ -443,8 +468,9 @@
1.117
1.118 static void test_run_update(void)
1.119 {
1.120 - gchar *root;
1.121 + gchar *root,*root_uri;
1.122 GError *err=NULL;
1.123 + GFile *file;
1.124 struct razor_importer *importer;
1.125 struct razor_set *downgraded;
1.126 struct razor_atomic *atomic;
1.127 @@ -454,7 +480,11 @@
1.128 struct run_update_baton baton={0,};
1.129 root=g_strdup("razor-test-dir-XXXXXX");
1.130 g_assert(mkdtemp(root));
1.131 - g_setenv("RAZOR_ROOT",root,TRUE);
1.132 + file=g_file_new_for_path(root);
1.133 + root_uri=g_file_get_uri(file);
1.134 + g_object_unref(file);
1.135 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.136 + g_free(root_uri);
1.137 helper=get_transaction_helper();
1.138 plover_transaction_helper_set_base(helper,"../yum-repo-test-dir");
1.139 installed=plover_package_set_new();
1.140 @@ -560,7 +590,8 @@
1.141 static void test_check_vendor(void)
1.142 {
1.143 int fh;
1.144 - gchar *root,*s;
1.145 + gchar *root,*root_uri,*s;
1.146 + GFile *file;
1.147 GError *err=NULL;
1.148 struct razor_importer *importer;
1.149 struct razor_set *downgraded;
1.150 @@ -572,7 +603,10 @@
1.151 g_setenv("PLOVER_VENDOR_PREFIX","/srv",TRUE);
1.152 root=g_strdup("razor-test-dir-XXXXXX");
1.153 g_assert(mkdtemp(root));
1.154 - g_setenv("RAZOR_ROOT",root,TRUE);
1.155 + file=g_file_new_for_path(root);
1.156 + root_uri=g_file_get_uri(file);
1.157 + g_object_unref(file);
1.158 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.159 helper=get_transaction_helper();
1.160 plover_transaction_helper_set_check_vendor(helper,TRUE);
1.161 plover_transaction_helper_set_base(helper,"../yum-repo-test-dir");
1.162 @@ -588,8 +622,8 @@
1.163 razor_importer_finish_package(importer);
1.164 downgraded=razor_importer_finish(importer);
1.165 atomic=razor_atomic_open("Add downgraded packages");
1.166 - razor_atomic_make_dirs(atomic,root,"/test/bin/zappy");
1.167 - s=g_build_filename(root,"test/bin/zappy",NULL);
1.168 + razor_atomic_make_dirs(atomic,root_uri,"/test/bin/zappy");
1.169 + s=g_build_filename(root_uri,"test/bin/zappy",NULL);
1.170 fh=razor_atomic_create_file(atomic,s,S_IRWXU|S_IRWXG|S_IRWXO);
1.171 g_free(s);
1.172 razor_atomic_close(atomic,fh);
1.173 @@ -610,6 +644,7 @@
1.174 g_object_unref(helper);
1.175 g_unsetenv("RAZOR_ROOT");
1.176 g_free(root);
1.177 + g_free(root_uri);
1.178 g_unsetenv("PLOVER_VENDOR_PREFIX");
1.179 }
1.180
1.181 @@ -652,17 +687,22 @@
1.182
1.183 static void test_set_error(void)
1.184 {
1.185 - gchar *root;
1.186 + gchar *root,*root_uri;
1.187 const char *errmsg;
1.188 GError *err=NULL;
1.189 const GError *err2=NULL;
1.190 + GFile *file;
1.191 PloverPackageSet *installed;
1.192 PloverTransactionHelper *helper;
1.193 struct set_error_baton baton={0,};
1.194 root=g_strdup("razor-test-dir-XXXXXX");
1.195 g_assert(mkdtemp(root));
1.196 - g_setenv("RAZOR_ROOT",root,TRUE);
1.197 + file=g_file_new_for_path(root);
1.198 g_free(root);
1.199 + root_uri=g_file_get_uri(file);
1.200 + g_object_unref(file);
1.201 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.202 + g_free(root_uri);
1.203 helper=get_transaction_helper();
1.204 installed=plover_package_set_new_from_installed("../razor-test-dir",&err);
1.205 if (!installed)