Move load fixtures to tests/fixtures root

Author: tony

tests/fixtures/__init__.py

@@ -1 +1 @@
-from . import config  # noqa
+from . import config, _util  # noqa

tests/fixtures/config/_util.py tests/fixtures/_util.pytests/fixtures/config/_util.py renamed to tests/fixtures/_util.py

@@ -1,8 +1,8 @@
 import os
 
-from ._util import loadfixture
+from .._util import loadfixture
 
-unexpanded_yaml = loadfixture('expand2-unexpanded.yaml')
-expanded_yaml = loadfixture('expand2-expanded.yaml').format(
+unexpanded_yaml = loadfixture('config/expand2-unexpanded.yaml')
+expanded_yaml = loadfixture('config/expand2-expanded.yaml').format(
     HOME=os.path.expanduser('~')
 )

tests/fixtures/config/expand2.py

@@ -1,4 +1,4 @@
-from ._util import loadfixture
+from .._util import loadfixture
 
-before = loadfixture("shell_command_before_session.yaml")
-expected = loadfixture("shell_command_before_session-expected.yaml")
+before = loadfixture("config/shell_command_before_session.yaml")
+expected = loadfixture("config/shell_command_before_session-expected.yaml")