marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #894 from smcv/isolate-tests 

tests: Isolate tests from real home directory more thoroughly
tingping/wmclass
Matthias Clasen 2017-07-04 09:22:36 -04:00 committed by GitHub
parent 2dca804768 5de225e615
commit 367c586862
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/libtest.sh
View File

@ -80,7 +80,9 @@ mkdir -p ${TEST_DATA_DIR}/system
export FLATPAK_SYSTEM_DIR=${TEST_DATA_DIR}/system
export FLATPAK_SYSTEM_HELPER_ON_SESSION=1
export HOME=${TEST_DATA_DIR}/home
export XDG_CACHE_HOME=${TEST_DATA_DIR}/home/cache
export XDG_CONFIG_HOME=${TEST_DATA_DIR}/home/config
export XDG_DATA_HOME=${TEST_DATA_DIR}/home/share
export XDG_RUNTIME_DIR=${TEST_DATA_DIR}/runtime

27
tests/testlibrary.c
View File

@ -766,6 +766,9 @@ copy_gpg (void)
static void
global_setup (void)
{
g_autofree char *cachedir = NULL;
g_autofree char *configdir = NULL;
g_autofree char *datadir = NULL;
g_autofree char *homedir = NULL;
testdir = g_strdup ("/var/tmp/flatpak-test-XXXXXX");
@ -773,11 +776,29 @@ global_setup (void)
if (g_test_verbose ())
g_print ("testdir: %s\n", testdir);
homedir = g_strconcat (testdir, "/home/share", NULL);
homedir = g_strconcat (testdir, "/home", NULL);
g_mkdir_with_parents (homedir, S_IRWXU|S_IRWXG|S_IRWXO);
g_setenv ("XDG_DATA_HOME", homedir, TRUE);
g_setenv ("HOME", homedir, TRUE);
if (g_test_verbose ())
g_print ("setting XDG_DATA_HOME=%s\n", homedir);
g_print ("setting HOME=%s\n", datadir);
cachedir = g_strconcat (testdir, "/home/cache", NULL);
g_mkdir_with_parents (cachedir, S_IRWXU|S_IRWXG|S_IRWXO);
g_setenv ("XDG_CACHE_HOME", cachedir, TRUE);
if (g_test_verbose ())
g_print ("setting XDG_CACHE_HOME=%s\n", cachedir);
configdir = g_strconcat (testdir, "/home/config", NULL);
g_mkdir_with_parents (configdir, S_IRWXU|S_IRWXG|S_IRWXO);
g_setenv ("XDG_CONFIG_HOME", configdir, TRUE);
if (g_test_verbose ())
g_print ("setting XDG_CONFIG_HOME=%s\n", configdir);
datadir = g_strconcat (testdir, "/home/share", NULL);
g_mkdir_with_parents (datadir, S_IRWXU|S_IRWXG|S_IRWXO);
g_setenv ("XDG_DATA_HOME", datadir, TRUE);
if (g_test_verbose ())
g_print ("setting XDG_DATA_HOME=%s\n", datadir);
flatpak_runtimedir = g_strconcat (testdir, "/runtime", NULL);
g_mkdir_with_parents (flatpak_runtimedir, S_IRWXU|S_IRWXG|S_IRWXO);