using factory for system binaries

Author: tulinkry

opengrok-tools/src/test/python/conftest.py

@@ -1,42 +1,18 @@
 import os
-import pytest
-
-
-@pytest.fixture(
-    params=[
-        pytest.param('/bin/true', marks=pytest.mark.skipif(not os.path.exists('/bin/true'), reason="requires /bin binaries")),
-        pytest.param('/usr/bin/true', marks=pytest.mark.skipif(not os.path.exists('/usr/bin/true'), reason="requires /usr/bin binaries"))
-    ]
-)
-def true_binary(request):
-    return request.param
 
+import pytest
 
-@pytest.fixture(
-    params=[
-        pytest.param('/bin/false', marks=pytest.mark.skipif(not os.path.exists('/bin/false'), reason="requires /bin binaries")),
-        pytest.param('/usr/bin/false', marks=pytest.mark.skipif(not os.path.exists('/usr/bin/false'), reason="requires /usr/bin binaries"))
-    ]
-)
-def false_binary(request):
-    return request.param
 
+def system_binary(name):
+    def decorator(fn):
+        return pytest.mark.parametrize(
+            ('{}_binary'.format(name)), [
+                pytest.param('/bin/{}'.format(name), marks=pytest.mark.skipif(not os.path.exists('/bin/{}'.format(name)), reason="requires /bin binaries")),
+                pytest.param('/usr/bin/{}'.format(name), marks=pytest.mark.skipif(not os.path.exists('/usr/bin/{}'.format(name)), reason="requires /usr/bin binaries")),
+            ])(fn)
 
-@pytest.fixture(
-    params=[
-        pytest.param('/bin/touch', marks=pytest.mark.skipif(not os.path.exists('/bin/touch'), reason="requires /bin binaries")),
-        pytest.param('/usr/bin/touch', marks=pytest.mark.skipif(not os.path.exists('/usr/bin/touch'), reason="requires /usr/bin binaries"))
-    ]
-)
-def touch_binary(request):
-    return request.param
+    return decorator
 
 
-@pytest.fixture(
-    params=[
-        pytest.param('/bin/echo', marks=pytest.mark.skipif(not os.path.exists('/bin/echo'), reason="requires /bin binaries")),
-        pytest.param('/usr/bin/echo', marks=pytest.mark.skipif(not os.path.exists('/usr/bin/echo'), reason="requires /usr/bin binaries"))
-    ]
-)
-def echo_binary(request):
-    return request.param
+def posix_only(fn):
+    return pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")(fn)

opengrok-tools/src/test/python/test_command.py

@@ -24,12 +24,13 @@
 #
 
 import os
+import platform
 import tempfile
 import time
-import platform
 
 import pytest
 
+from conftest import posix_only, system_binary
 from opengrok_tools.utils.command import Command
 
 
@@ -74,14 +75,14 @@ def test_execute_nonexistent():
     assert cmd.getstate() == Command.ERRORED
 
 
-@pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")
+@posix_only
 def test_getoutput():
     cmd = Command(['/bin/ls', '/etc/passwd'])
     cmd.execute()
     assert cmd.getoutput() == ['/etc/passwd\n']
 
 
-@pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")
+@posix_only
 def test_work_dir():
     os.chdir("/")
     orig_cwd = os.getcwd()
@@ -101,6 +102,8 @@ def test_env():
     assert "FOO=BAR\n" in cmd.getoutput()
 
 
+@system_binary('true')
+@system_binary('false')
 def test_retcode(true_binary, false_binary):
     cmd = Command([false_binary])
     cmd.execute()
@@ -145,7 +148,7 @@ def test_command_notimeout():
     assert cmd.getretcode() == 0
 
 
-@pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")
+@posix_only
 def test_stderr():
     cmd = Command(["/bin/cat", "/foo/bar", "/etc/passwd"],
                   redirect_stderr=False)
@@ -160,7 +163,7 @@ def test_stderr():
 
 
 # This test needs the "/bin/cat" command, therefore it is Unix only.
-@pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")
+@posix_only
 def test_long_output():
     """
     Test that output thread in the Command class captures all of the output.
@@ -188,7 +191,7 @@ def test_long_output():
         assert len("".join(cmd.getoutput())) == num_bytes
 
 
-@pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")
+@posix_only
 def test_resource_limits():
     """
     Simple smoke test for setting resource limits.

opengrok-tools/src/test/python/test_mirror.py

@@ -33,6 +33,7 @@
 from mockito import verify, patch, spy2, mock, ANY, when
 
 import opengrok_tools.mirror
+from conftest import posix_only, system_binary
 from opengrok_tools.scm import Repository
 from opengrok_tools.scm.git import GitRepository
 from opengrok_tools.scm.repository import RepositoryException
@@ -94,7 +95,7 @@ def test_invalid_project_config_hooknames():
         assert not check_project_configuration(config, hookdir=tmpdir)
 
 
-@pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")
+@posix_only
 def test_invalid_project_config_nonexec_hook():
     with tempfile.TemporaryDirectory() as tmpdir:
         with open(os.path.join(tmpdir, "foo.sh"), 'w+') as tmpfile:
@@ -103,7 +104,7 @@ def test_invalid_project_config_nonexec_hook():
             assert not check_project_configuration(config, hookdir=tmpdir)
 
 
-@pytest.mark.skipif(not os.name.startswith("posix"), reason="requires posix")
+@posix_only
 def test_valid_project_config_hook():
     with tempfile.TemporaryDirectory() as tmpdir:
         with open(os.path.join(tmpdir, "foo.sh"), 'w+') as tmpfile:
@@ -359,6 +360,7 @@ def test_mirroring_custom_repository_command(expected_command, config):
     assert expected_command == Repository._repository_command(config, lambda: DEFAULT_COMMAND)
 
 
+@system_binary('touch')
 def test_mirroring_custom_incoming_invoke_command(touch_binary):
     checking_file = 'incoming.txt'
     with tempfile.TemporaryDirectory() as repository_root:
@@ -369,6 +371,7 @@ def test_mirroring_custom_incoming_invoke_command(touch_binary):
         assert checking_file in os.listdir(repository_root)
 
 
+@system_binary('echo')
 def test_mirroring_custom_incoming_changes(echo_binary):
     with tempfile.TemporaryDirectory() as repository_root:
         repository = GitRepository(mock(), repository_root, 'test-1', {
@@ -377,6 +380,7 @@ def test_mirroring_custom_incoming_changes(echo_binary):
         assert repository.incoming() is True
 
 
+@system_binary('true')
 def test_mirroring_custom_incoming_no_changes(true_binary):
     with tempfile.TemporaryDirectory() as repository_root:
         repository = GitRepository(mock(), repository_root, 'test-1', {
@@ -385,6 +389,7 @@ def test_mirroring_custom_incoming_no_changes(true_binary):
         assert repository.incoming() is False
 
 
+@system_binary('false')
 def test_mirroring_custom_incoming_error(false_binary):
     with pytest.raises(RepositoryException):
         with tempfile.TemporaryDirectory() as repository_root:
@@ -403,6 +408,7 @@ def test_mirroring_incoming_invoke_original_command():
             verify(repository).incoming_check()
 
 
+@system_binary('touch')
 def test_mirroring_custom_sync_invoke_command(touch_binary):
     checking_file = 'sync.txt'
     with tempfile.TemporaryDirectory() as repository_root:
@@ -413,6 +419,7 @@ def test_mirroring_custom_sync_invoke_command(touch_binary):
         assert checking_file in os.listdir(repository_root)
 
 
+@system_binary('true')
 def test_mirroring_custom_sync_success(true_binary):
     with tempfile.TemporaryDirectory() as repository_root:
         repository = GitRepository(mock(), repository_root, 'test-1', {
@@ -421,6 +428,7 @@ def test_mirroring_custom_sync_success(true_binary):
         assert 0 == repository.sync()
 
 
+@system_binary('false')
 def test_mirroring_custom_sync_error(false_binary):
     with tempfile.TemporaryDirectory() as repository_root:
         repository = GitRepository(mock(), repository_root, 'test-1', {