1.1 --- a/tests/plover/test-transaction.c Mon Jun 13 12:18:42 2016 +0100
1.2 +++ b/tests/plover/test-transaction.c Thu Jun 16 12:11:14 2016 +0100
1.3 @@ -56,8 +56,14 @@
1.4 struct razor_package *pkg;
1.5 enum razor_install_action action;
1.6 int count;
1.7 + gchar *root_uri;
1.8 GError *err=NULL;
1.9 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.10 + GFile *file;
1.11 + file=g_file_new_for_path("../razor-test-dir");
1.12 + root_uri=g_file_get_uri(file);
1.13 + g_object_unref(file);
1.14 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.15 + g_free(root_uri);
1.16 transaction=plover_transaction_new_update("../yum-repo-test-dir","/test",
1.17 NULL,&err);
1.18 if (!transaction && err)
1.19 @@ -85,8 +91,14 @@
1.20 {
1.21 PloverTransaction *transaction;
1.22 char *pkgs[]={"nonexistant",NULL};
1.23 + gchar *root_uri;
1.24 GError *err=NULL;
1.25 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.26 + GFile *file;
1.27 + file=g_file_new_for_path("../razor-test-dir");
1.28 + root_uri=g_file_get_uri(file);
1.29 + g_object_unref(file);
1.30 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.31 + g_free(root_uri);
1.32 transaction=plover_transaction_new_update("../yum-repo-test-dir","/test",
1.33 pkgs,&err);
1.34 g_assert(!transaction);
1.35 @@ -105,8 +117,14 @@
1.36 int count;
1.37 char *name;
1.38 char *pkgs[]={"zip",NULL};
1.39 + gchar *root_uri;
1.40 GError *err=NULL;
1.41 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.42 + GFile *file;
1.43 + file=g_file_new_for_path("../razor-test-dir");
1.44 + root_uri=g_file_get_uri(file);
1.45 + g_object_unref(file);
1.46 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.47 + g_free(root_uri);
1.48 transaction=plover_transaction_new_install("../yum-repo-test-dir","/test",
1.49 pkgs,&err);
1.50 if (!transaction && err)
1.51 @@ -138,8 +156,14 @@
1.52 {
1.53 PloverTransaction *transaction;
1.54 char *pkgs[]={"nonexistant",NULL};
1.55 + gchar *root_uri;
1.56 GError *err=NULL;
1.57 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.58 + GFile *file;
1.59 + file=g_file_new_for_path("../razor-test-dir");
1.60 + root_uri=g_file_get_uri(file);
1.61 + g_object_unref(file);
1.62 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.63 + g_free(root_uri);
1.64 transaction=plover_transaction_new_install("../yum-repo-test-dir","/test",
1.65 pkgs,&err);
1.66 g_assert(!transaction);
1.67 @@ -158,8 +182,14 @@
1.68 int count;
1.69 char *name;
1.70 char *pkgs[]={"uninstallable",NULL};
1.71 + gchar *root_uri;
1.72 GError *err=NULL;
1.73 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.74 + GFile *file;
1.75 + file=g_file_new_for_path("../razor-test-dir");
1.76 + root_uri=g_file_get_uri(file);
1.77 + g_object_unref(file);
1.78 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.79 + g_free(root_uri);
1.80 transaction=plover_transaction_new_install("../yum-repo-test-dir","/test",
1.81 pkgs,&err);
1.82 if (!transaction && err)
1.83 @@ -185,6 +215,7 @@
1.84 g_assert_cmpstr(name,==,"uninstallable");
1.85 g_assert(!razor_install_iterator_next(iter,&pkg,&action,&count));
1.86 g_assert(!plover_transaction_commit(transaction,NULL,&err));
1.87 + g_message("plover_transaction_commit: %s",err->message);
1.88 g_assert_cmpint(err->domain,==,PLOVER_RAZOR_ERROR);
1.89 g_assert_cmpint(err->code,==,RAZOR_GENERAL_ERROR_FAILED);
1.90 g_clear_error(&err);
1.91 @@ -197,8 +228,14 @@
1.92 struct razor_install_iterator *iter;
1.93 char *pkgs[]={"unsatisfiable",NULL};
1.94 const char *s;
1.95 + gchar *root_uri;
1.96 GError *err=NULL;
1.97 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.98 + GFile *file;
1.99 + file=g_file_new_for_path("../razor-test-dir");
1.100 + root_uri=g_file_get_uri(file);
1.101 + g_object_unref(file);
1.102 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.103 + g_free(root_uri);
1.104 transaction=plover_transaction_new_install("../yum-repo-test-dir","/test",
1.105 pkgs,&err);
1.106 if (!transaction && err)
1.107 @@ -226,8 +263,14 @@
1.108 int count;
1.109 char *name;
1.110 char *pkgs[]={"zappy-tools",NULL};
1.111 + gchar *root_uri;
1.112 GError *err=NULL;
1.113 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.114 + GFile *file;
1.115 + file=g_file_new_for_path("../razor-test-dir");
1.116 + root_uri=g_file_get_uri(file);
1.117 + g_object_unref(file);
1.118 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.119 + g_free(root_uri);
1.120 transaction=plover_transaction_new_remove(pkgs,&err);
1.121 if (!transaction && err)
1.122 g_error("zappy-tools: %s",err->message);
1.123 @@ -254,8 +297,14 @@
1.124 {
1.125 PloverTransaction *transaction;
1.126 char *pkgs[]={"nonexistant",NULL};
1.127 + gchar *root_uri;
1.128 GError *err=NULL;
1.129 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.130 + GFile *file;
1.131 + file=g_file_new_for_path("../razor-test-dir");
1.132 + root_uri=g_file_get_uri(file);
1.133 + g_object_unref(file);
1.134 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.135 + g_free(root_uri);
1.136 transaction=plover_transaction_new_remove(pkgs,&err);
1.137 g_assert(!transaction);
1.138 g_assert(g_error_matches(err,PLOVER_GENERAL_ERROR,
1.139 @@ -301,8 +350,14 @@
1.140 int count;
1.141 char *name;
1.142 char *pkgs[]={"zappy-tools",NULL};
1.143 + gchar *root_uri;
1.144 GError *err=NULL;
1.145 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.146 + GFile *file;
1.147 + file=g_file_new_for_path("../razor-test-dir");
1.148 + root_uri=g_file_get_uri(file);
1.149 + g_object_unref(file);
1.150 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.151 + g_free(root_uri);
1.152 transaction=plover_transaction_new_remove_with_leaves(pkgs,&err);
1.153 if (!transaction && err)
1.154 g_error("zappy-tools: %s",err->message);
1.155 @@ -335,8 +390,14 @@
1.156 {
1.157 PloverTransaction *transaction;
1.158 char *pkgs[]={"nonexistant",NULL};
1.159 + gchar *root_uri;
1.160 GError *err=NULL;
1.161 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.162 + GFile *file;
1.163 + file=g_file_new_for_path("../razor-test-dir");
1.164 + root_uri=g_file_get_uri(file);
1.165 + g_object_unref(file);
1.166 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.167 + g_free(root_uri);
1.168 transaction=plover_transaction_new_remove_with_leaves(pkgs,&err);
1.169 g_assert(!transaction);
1.170 g_assert(g_error_matches(err,PLOVER_GENERAL_ERROR,
1.171 @@ -354,9 +415,15 @@
1.172 enum razor_install_action action;
1.173 int count;
1.174 char *name;
1.175 + gchar *root_uri;
1.176 GError *err=NULL;
1.177 + GFile *file;
1.178 GList *expected=NULL,*lnk;
1.179 - g_setenv("RAZOR_ROOT","../razor-test-dir",TRUE);
1.180 + file=g_file_new_for_path("../razor-test-dir");
1.181 + root_uri=g_file_get_uri(file);
1.182 + g_object_unref(file);
1.183 + g_setenv("RAZOR_ROOT",root_uri,TRUE);
1.184 + g_free(root_uri);
1.185 transaction=plover_transaction_new_remove_with_leaves(NULL,&err);
1.186 if (!transaction && err)
1.187 g_error("remove-all: %s",err->message);