tests: commands: Consolidate the installed package/run from git tests

In order to support both use cases of lcitool (running from git, using
an installed package) there were two test cases one of which was
properly skipped by pytest if the package wasn't installed. That
however wasn't optimal, as in local environments the same tests ran
twice. Consolidate the logic so that pytest figures this out
dynamically and only run the test case once.

Signed-off-by: Erik Skultety <eskultet@redhat.com>

1 files changed, 7 insertions, 13 deletions

diff --git a/tests/test_commands.py b/tests/test_commands.py
index f23b81f..f289de7 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -4,7 +4,6 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-import os
 import pytest
 import subprocess
 import sys
@@ -24,17 +23,12 @@ cli_args = [
 
 @pytest.mark.parametrize("test_cli_args", cli_args)
 def test_commands(test_cli_args):
-    pybase = Path(__file__).parent.parent
-    lcitool = pybase.joinpath("bin", "lcitool")
-    subenv = os.environ
-    subenv["PYTHONPATH"] = str(pybase)
-    subprocess.check_call([lcitool] + test_cli_args, stdout=subprocess.DEVNULL)
+    if sys.prefix == sys.base_prefix:
+        # we're running the tests directly from git using the lcitool wrapper
+        lcitool_path = Path(__file__).parent.parent.joinpath("bin", "lcitool")
+    else:
+        # we're running the tests in a virtual env
+        lcitool_path = Path(sys.prefix, "bin/lcitool")
 
-
-@pytest.mark.skipif(sys.prefix == sys.base_prefix,
-                    reason="lcitool package not installed")
-@pytest.mark.parametrize("test_cli_args", cli_args)
-def test_commands_installed(test_cli_args):
-    lcitool_venv_path = Path(sys.prefix, "bin/lcitool")
-    subprocess.check_call([lcitool_venv_path] + test_cli_args,
+    subprocess.check_call([lcitool_path] + test_cli_args,
                           stdout=subprocess.DEVNULL)