CI: Extracted args pytest fixture to a different file (MR 1938)

.gitlab-ci/testcases/conftest.py

+#!/usr/bin/env python3
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import add_pmbootstrap_to_import_path
+import pmb.parse
+import pytest
+import sys
+import os
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
+    sys.argv = ["pmbootstrap",
+                "--aports", pmaports,
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args

.gitlab-ci/testcases/test_aports_device.py

@@ -12,22 +12,6 @@ import pmb.parse
 import pmb.parse._apkbuild
 
 
-@pytest.fixture
-def args(request):
-    # Initialize args
-    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
-    sys.argv = ["pmbootstrap",
-                "--aports", pmaports,
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
 def device_dependency_check(apkbuild, path):
     """ Raise an error if a device package has a dependency that is not allowed
         (e.g. because it should be in a subpackage instead). """

.gitlab-ci/testcases/test_aports_deviceinfo.py

@@ -11,22 +11,6 @@ import add_pmbootstrap_to_import_path
 import pmb.parse
 
 
-@pytest.fixture
-def args(request):
-    # Initialize args
-    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
-    sys.argv = ["pmbootstrap",
-                "--aports", pmaports,
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
 def deviceinfo_obsolete(info):
     """
     Test for obsolete options used in the deviceinfo file. They must still be

.gitlab-ci/testcases/test_aports_framework_versions.py

@@ -17,21 +17,6 @@ import pmb.config
 import pmb.parse
 
 
-@pytest.fixture
-def args(request):
-    # Initialize args
-    sys.argv = ["pmbootstrap",
-                "--aports", os.path.dirname(__file__) + "/../..",
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
 def get_categorized_packages(args):
     """
     Parse all aports and categorize them.

.gitlab-ci/testcases/test_aports_kernel.py

@@ -11,22 +11,6 @@ import add_pmbootstrap_to_import_path
 import pmb.parse
 
 
-@pytest.fixture
-def args(request):
-    # Initialize args
-    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
-    sys.argv = ["pmbootstrap",
-                "--aports", pmaports,
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
 def test_aports_kernel(args):
     """
     Various tests performed on the /**/linux-* aports.

.gitlab-ci/testcases/test_aports_ui.py

@@ -11,22 +11,6 @@ import add_pmbootstrap_to_import_path
 import pmb.parse
 
 
-@pytest.fixture
-def args(request):
-    # Initialize args
-    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
-    sys.argv = ["pmbootstrap",
-                "--aports", pmaports,
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
 def test_aports_ui(args):
     """
     Raise an error if package in _pmb_recommends is not found

.gitlab-ci/testcases/test_aports_unreferenced_files.py

@@ -14,22 +14,6 @@ import pmb.parse.apkindex
 import pmb.helpers.repo
 
 
-@pytest.fixture
-def args(request):
-    # Initialize args
-    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
-    sys.argv = ["pmbootstrap",
-                "--aports", pmaports,
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
 def parse_source_from_checksums(args, apkbuild_path):
     """
     Read the APKBUILD file and parse source files from the checksums at the