Merge pull request #6074 from clebergnu/fedora_41_rpm_build

selftests: drop job-api test variant that may exceed sqlite3's own limits
avocado-framework · Dec 2, 2024 · 91752d4 · 91752d4
2 parents 9bc4760 + b80f298
commit 91752d4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/optional_plugins/html/setup.py b/optional_plugins/html/setup.py
@@ -39,7 +39,11 @@ def get_long_description():
     url="http://avocado-framework.github.io/",
     packages=find_packages(),
     include_package_data=True,
-    install_requires=[f"avocado-framework=={VERSION}", "jinja2", "markupsafe<3.0.0"],
+    install_requires=[
+        f"avocado-framework=={VERSION}",
+        "jinja2",
+        "markupsafe<3.0.0",
+    ],
     entry_points={
         "avocado.plugins.cli": [
             "html = avocado_result_html:HTML",

diff --git a/python-avocado.spec b/python-avocado.spec
@@ -104,6 +104,10 @@ these days a framework) to perform automated testing.
 %if 0%{?rhel}
 sed -e 's/"PyYAML>=4.2b2"/"PyYAML>=3.12"/' -i optional_plugins/varianter_yaml_to_mux/setup.py
 %endif
+%if 0%{?fedora} >= 42
+sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/html/setup.py
+sed -e '/"markupsafe<3.0.0"/d' -i optional_plugins/ansible/setup.py
+%endif
 %py3_build
 pushd optional_plugins/html
 %py3_build

diff --git a/selftests/check.py b/selftests/check.py
@@ -18,13 +18,13 @@
 
 TEST_SIZE = {
     "static-checks": 7,
-    "job-api-1": 1,
-    "job-api-2": 1,
-    "job-api-3": 2,
-    "job-api-4": 9,
-    "job-api-5": 12,
-    "job-api-6": 4,
-    "job-api-7": 1,
+    "job-api-check-archive-file-exists": 1,
+    "job-api-check-category-directory-exists": 1,
+    "job-api-check-directory-exists": 2,
+    "job-api-check-file-content": 9,
+    "job-api-check-file-exists": 11,
+    "job-api-check-output-file": 4,
+    "job-api-check-tmp-directory-exists": 1,
     "nrunner-interface": 70,
     "nrunner-requirement": 28,
     "unit": 681,
@@ -289,7 +289,7 @@ def get_ref(method_short_name):
 
     suites.append(
         TestSuite.from_config(
-            config_check_archive_file_exists, f"job-api-{len(suites) + 1}"
+            config_check_archive_file_exists, "job-api-check-archive-file-exists"
         )
     )
 
@@ -306,7 +306,8 @@ def get_ref(method_short_name):
 
     suites.append(
         TestSuite.from_config(
-            config_check_category_directory_exists, f"job-api-{len(suites) + 1}"
+            config_check_category_directory_exists,
+            "job-api-check-category-directory-exists",
         )
     )
 
@@ -334,7 +335,7 @@ def get_ref(method_short_name):
 
     suites.append(
         TestSuite.from_config(
-            config_check_directory_exists, f"job-api-{len(suites) + 1}"
+            config_check_directory_exists, "job-api-check-directory-exists"
         )
     )
 
@@ -427,7 +428,7 @@ def get_ref(method_short_name):
     }
 
     suites.append(
-        TestSuite.from_config(config_check_file_content, f"job-api-{len(suites) + 1}")
+        TestSuite.from_config(config_check_file_content, "job-api-check-file-content")
     )
 
     # ========================================================================
@@ -491,13 +492,6 @@ def get_ref(method_short_name):
                 "file": "result.xml",
                 "assert": False,
             },
-            # this test needs a huge improvement
-            {
-                "namespace": "run.journal.enabled",
-                "value": True,
-                "file": ".journal.sqlite",
-                "assert": True,
-            },
         ],
     }
 
@@ -525,7 +519,7 @@ def get_ref(method_short_name):
         )
 
     suites.append(
-        TestSuite.from_config(config_check_file_exists, f"job-api-{len(suites) + 1}")
+        TestSuite.from_config(config_check_file_exists, "job-api-check-file-exists")
     )
 
     # ========================================================================
@@ -568,7 +562,7 @@ def get_ref(method_short_name):
         )
 
     suites.append(
-        TestSuite.from_config(config_check_output_file, f"job-api-{len(suites) + 1}")
+        TestSuite.from_config(config_check_output_file, "job-api-check-output-file")
     )
 
     # ========================================================================
@@ -584,7 +578,7 @@ def get_ref(method_short_name):
 
     suites.append(
         TestSuite.from_config(
-            config_check_tmp_directory_exists, f"job-api-{len(suites) + 1}"
+            config_check_tmp_directory_exists, "job-api-check-tmp-directory-exists"
         )
     )
     return suites