From 951cab237f45a04c166e789baee726a4f4cadfc2 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Tue, 26 Apr 2016 23:51:48 +0200
Subject: [PATCH] tests: factor out common code in test_invocations

---
 tests/integration/test_invocations.py | 43 ++++++++-------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/tests/integration/test_invocations.py b/tests/integration/test_invocations.py
index 14b6fb506..72fe55b90 100644
--- a/tests/integration/test_invocations.py
+++ b/tests/integration/test_invocations.py
@@ -22,11 +22,11 @@
 import pytest
 
 
-@pytest.mark.linux
-def test_no_config(tmpdir, quteproc_new):
-    """Test starting with -c "".
+@pytest.fixture
+def temp_basedir_env(tmpdir):
+    """Return a dict of environment variables that fakes --temp-basedir.
 
-    We can't run --basedir or --temp-basedir to reproduce this, so we mess with
+    We can't run --basedir or --temp-basedir for some tests, so we mess with
     XDG_*_DIR to get things relocated.
     """
     data_dir = tmpdir / 'data'
@@ -46,40 +46,23 @@ def test_no_config(tmpdir, quteproc_new):
         'XDG_RUNTIME_DIR': str(runtime_dir),
         'XDG_CACHE_HOME': str(cache_dir),
     }
+    return env
 
+
+@pytest.mark.linux
+def test_no_config(temp_basedir_env, quteproc_new):
+    """Test starting with -c ""."""
     args = ['--debug', '--no-err-windows', '-c', '', 'about:blank']
-    quteproc_new.start(args, env=env)
+    quteproc_new.start(args, env=temp_basedir_env)
     quteproc_new.send_cmd(':quit')
     quteproc_new.wait_for_quit()
 
 
 @pytest.mark.linux
-def test_no_cache(tmpdir, quteproc_new):
-    """Test starting with --cachedir="".
-
-    We can't run --basedir or --temp-basedir to reproduce this, so we mess with
-    XDG_*_DIR to get things relocated.
-    """
-    data_dir = tmpdir / 'data'
-    config_dir = tmpdir / 'config'
-    runtime_dir = tmpdir / 'runtime'
-    cache_dir = tmpdir / 'cache'
-
-    runtime_dir.ensure(dir=True)
-    runtime_dir.chmod(0o700)
-
-    (data_dir / 'qutebrowser' / 'state').write_text(
-        '[general]\nquickstart-done = 1', encoding='utf-8', ensure=True)
-
-    env = {
-        'XDG_DATA_HOME': str(data_dir),
-        'XDG_CONFIG_HOME': str(config_dir),
-        'XDG_RUNTIME_DIR': str(runtime_dir),
-        'XDG_CACHE_HOME': str(cache_dir),
-    }
-
+def test_no_cache(temp_basedir_env, quteproc_new):
+    """Test starting with --cachedir=""."""
     args = ['--debug', '--no-err-windows', '--cachedir=""', 'about:blank']
-    quteproc_new.start(args, env=env)
+    quteproc_new.start(args, env=temp_basedir_env)
     quteproc_new.send_cmd(':quit')
     quteproc_new.wait_for_quit()