test: Fixture reorganization

scop · Jul 8, 2018 · c677b8e · c677b8e
1 parent 2c32433
commit c677b8e
Show file tree

Hide file tree

Showing 32 changed files with 124 additions and 67 deletions.
diff --git a/test/generate b/test/generate
@@ -16,7 +16,7 @@ marker=
 
 if [[ $cmd == *.* ]]; then
     file=${cmd//./-}
-    marker=$'\n'"@pytest.mark.command(\"$cmd\")"
+    marker=$'\n'"@pytest.mark.bashcomp("$'\n'"    cmd=\"$cmd\","$'\n'")"
 fi
 
 name=$(python -c "import re,sys;print(re.sub('(^|[_-]+)(.)',lambda m:m.group(2).upper(),sys.argv[1]))" $file)

diff --git a/test/t/conftest.py b/test/t/conftest.py
@@ -49,10 +49,13 @@ def bash(request) -> pexpect.spawn:
 
     # Use command name from marker if set, or grab from test filename
     cmd = None
-    marker = request.node.get_marker("command")
+    marker = request.node.get_marker("bashcomp")
     if marker:
-        if marker.args:
-            cmd = marker.args[0]
+        cmd = marker.kwargs.get("cmd")
+        # Run pre-test commands, early so they're usable in skipif
+        for pre_cmd in marker.kwargs.get("pre_cmds", []):
+            assert_bash_exec(bash, pre_cmd)
+        # Process skip conditions
         skipif = marker.kwargs.get("skipif")
         if skipif:
             try:
@@ -69,12 +72,6 @@ def bash(request) -> pexpect.spawn:
         if match:
             cmd = match.group(1)
 
-    # Run pre-test commands
-    marker = request.node.get_marker("pre_commands")
-    if marker:
-        for pre_cmd in marker.args:
-            assert_bash_exec(bash, pre_cmd)
-
     if is_testable(bash, cmd):
         before_env = get_env(bash)
         yield bash

diff --git a/test/t/test_arch.py b/test/t/test_arch.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestArch(object):
 

diff --git a/test/t/test_btdownloadcurses-py.py b/test/t/test_btdownloadcurses-py.py
@@ -1,7 +1,9 @@
 import pytest
 
 
-@pytest.mark.command("btdownloadcurses.py")
+@pytest.mark.bashcomp(
+    cmd="btdownloadcurses.py",
+)
 class TestBtdownloadcursesPy(object):
 
     @pytest.mark.complete("btdownloadcurses.py ")

diff --git a/test/t/test_btdownloadgui-py.py b/test/t/test_btdownloadgui-py.py
@@ -1,7 +1,9 @@
 import pytest
 
 
-@pytest.mark.command("btdownloadgui.py")
+@pytest.mark.bashcomp(
+    cmd="btdownloadgui.py",
+)
 class TestBtdownloadguiPy(object):
 
     @pytest.mark.complete("btdownloadgui.py ")

diff --git a/test/t/test_btdownloadheadless-py.py b/test/t/test_btdownloadheadless-py.py
@@ -1,7 +1,9 @@
 import pytest
 
 
-@pytest.mark.command("btdownloadheadless.py")
+@pytest.mark.bashcomp(
+    cmd="btdownloadheadless.py",
+)
 class TestBtdownloadheadlessPy(object):
 
     @pytest.mark.complete("btdownloadheadless.py ")

diff --git a/test/t/test_change_pw.py b/test/t/test_change_pw.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestChangePw(object):
 

diff --git a/test/t/test_cleanarch.py b/test/t/test_cleanarch.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestCleanarch(object):
 

diff --git a/test/t/test_configure.py b/test/t/test_configure.py
@@ -1,9 +1,11 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    # Make sure our own ./configure is in PATH
-    "PATH+=:$PWD/../..",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        # Make sure our own ./configure is in PATH
+        "PATH=$PWD/../..:$PATH",
+    ),
 )
 class TestConfigure(object):
 

diff --git a/test/t/test_cvs.py b/test/t/test_cvs.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "HOME=$PWD/cvs",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "HOME=$PWD/cvs",
+    ),
 )
 class TestCvs(object):
 

diff --git a/test/t/test_cvsps.py b/test/t/test_cvsps.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "HOME=$PWD/cvs",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "HOME=$PWD/cvs",
+    ),
 )
 class TestCvsps(object):
 

diff --git a/test/t/test_dumpdb.py b/test/t/test_dumpdb.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestDumpdb(object):
 

diff --git a/test/t/test_flake8.py b/test/t/test_flake8.py
@@ -1,7 +1,9 @@
 import pytest
 
 
-@pytest.mark.command(skipif="! flake8 --help &>/dev/null")
+@pytest.mark.bashcomp(
+    skipif="! flake8 --help &>/dev/null",
+)
 class TestFlake8(object):
 
     @pytest.mark.complete("flake8 ")

diff --git a/test/t/test_genaliases.py b/test/t/test_genaliases.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestGenaliases(object):
 

diff --git a/test/t/test_hid2hci.py b/test/t/test_hid2hci.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/lib/udev',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/lib/udev:$PATH",
+    ),
 )
 class TestHid2hci(object):
 

diff --git a/test/t/test_info.py b/test/t/test_info.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "INFOPATH+=:info:",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "INFOPATH+=:$PWD/info:",
+    ),
 )
 class TestInfo(object):
 

diff --git a/test/t/test_inject.py b/test/t/test_inject.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestInject(object):
 

diff --git a/test/t/test_invoke-rc-d.py b/test/t/test_invoke-rc-d.py
@@ -1,7 +1,9 @@
 import pytest
 
 
-@pytest.mark.command("invoke-rc.d")
+@pytest.mark.bashcomp(
+    cmd="invoke-rc.d",
+)
 class TestInvokeRcD(object):
 
     @pytest.mark.complete("invoke-rc.d ")

diff --git a/test/t/test_isql.py b/test/t/test_isql.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "ODBCINI=isql/odbc.ini",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "ODBCINI=isql/odbc.ini",
+    ),
 )
 class TestIsql(object):
 

diff --git a/test/t/test_java.py b/test/t/test_java.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'CLASSPATH=$PWD/java/a:$PWD/java/bashcomp.jar',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "CLASSPATH=$PWD/java/a:$PWD/java/bashcomp.jar",
+    ),
 )
 class TestJava(object):
 

diff --git a/test/t/test_list_owners.py b/test/t/test_list_owners.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestListOwners(object):
 

diff --git a/test/t/test_mailmanctl.py b/test/t/test_mailmanctl.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'PATH=$PATH:/usr/lib/mailman/bin',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PATH=/usr/lib/mailman/bin:$PATH",
+    ),
 )
 class TestMailmanctl(object):
 

diff --git a/test/t/test_mencoder.py b/test/t/test_mencoder.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "HOME=$PWD/mplayer",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "HOME=$PWD/mplayer",
+    ),
 )
 class TestMencoder(object):
 

diff --git a/test/t/test_mplayer.py b/test/t/test_mplayer.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "HOME=$PWD/mplayer",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "HOME=$PWD/mplayer",
+    ),
 )
 class TestMplayer(object):
 

diff --git a/test/t/test_perldoc.py b/test/t/test_perldoc.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "export PERL5LIB=$PWD/perldoc",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "export PERL5LIB=$PWD/perldoc",
+    ),
 )
 class TestPerldoc(object):
 

diff --git a/test/t/test_pinfo.py b/test/t/test_pinfo.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "INFOPATH+=:info:",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "INFOPATH+=:$PWD/info:",
+    ),
 )
 class TestPinfo(object):
 

diff --git a/test/t/test_pkg_deinstall.py b/test/t/test_pkg_deinstall.py
@@ -3,8 +3,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "PKG_DBDIR=pkgtools/db",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PKG_DBDIR=$PWD/pkgtools/db",
+    ),
 )
 class TestPkgDeinstall(object):
 

diff --git a/test/t/test_portupgrade.py b/test/t/test_portupgrade.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    "PKG_DBDIR=$PWD/dbtools/db",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "PKG_DBDIR=$PWD/dbtools/db",
+    ),
 )
 class TestPortupgrade(object):
 

diff --git a/test/t/test_ri.py b/test/t/test_ri.py
@@ -1,8 +1,10 @@
 import pytest
 
 
-@pytest.mark.pre_commands(
-    'export RI="-d ri"',
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        "export RI='-d ri'",
+    ),
 )
 class TestRi(object):
 

diff --git a/test/t/test_ssh-copy-id.py b/test/t/test_ssh-copy-id.py
@@ -1,10 +1,12 @@
 import pytest
 
 
-# Some old versions of ssh-copy-id won't output even usage if no
-# identities are found. Try to make sure there is at least one.
-@pytest.mark.pre_commands(
-    "HOME=$PWD/ssh-copy-id",
+@pytest.mark.bashcomp(
+    pre_cmds=(
+        # Some old versions of ssh-copy-id won't output even usage if no
+        # identities are found. Try to make sure there is at least one.
+        "HOME=$PWD/ssh-copy-id",
+    ),
 )
 class TestSshCopyId(object):