enterprise option is obsolete

Author: apetenchea

tests/conftest.py

@@ -27,7 +27,6 @@ class GlobalData:
     graph_name: str = "test_graph"
     username: str = generate_username()
     cluster: bool = False
-    enterprise: bool = False
     skip: list[str] = None
     db_version: version.Version = version.parse("0.0.0")
 
@@ -54,12 +53,6 @@ def pytest_addoption(parser):
     parser.addoption(
         "--cluster", action="store_true", help="Run tests in a cluster setup"
     )
-    parser.addoption(
-        "--enterprise",
-        action="store_true",
-        default=True,
-        help="Run tests in an enterprise setup",
-    )
     parser.addoption(
         "--skip",
         action="store",
@@ -69,6 +62,7 @@ def pytest_addoption(parser):
             "jwt-secret-keyfile",  # server was not configured with a keyfile
             "foxx",  # foxx is not supported
             "js-transactions",  # javascript transactions are not supported
+            "enterprise",  # skip what used to be "enterprise-only" before 3.12
         ],
         default=[],
         help="Skip specific tests",
@@ -86,7 +80,6 @@ def pytest_configure(config):
     global_data.secret = config.getoption("secret")
     global_data.token = JwtToken.generate_token(global_data.secret)
     global_data.cluster = config.getoption("cluster")
-    global_data.enterprise = config.getoption("enterprise")
     global_data.skip = config.getoption("skip")
     global_data.graph_name = generate_graph_name()
 
@@ -134,11 +127,6 @@ def skip_tests():
     return global_data.skip
 
 
-@pytest.fixture
-def enterprise():
-    return global_data.enterprise
-
-
 @pytest.fixture
 def username():
     return global_data.username

tests/test_analyzer.py

@@ -11,7 +11,7 @@
 
 
 @pytest.mark.asyncio
-async def test_analyzer_management(db, bad_db, enterprise, db_version):
+async def test_analyzer_management(db, bad_db, skip_tests, db_version):
     analyzer_name = generate_analyzer_name()
     full_analyzer_name = db.name + "::" + analyzer_name
     bad_analyzer_name = generate_analyzer_name()
@@ -68,7 +68,7 @@ async def test_analyzer_management(db, bad_db, enterprise, db_version):
     assert await db.delete_analyzer(analyzer_name, ignore_missing=True) is False
 
     # Test create geo_s2 analyzer
-    if enterprise:
+    if "enterprise" not in skip_tests:
         analyzer_name = generate_analyzer_name()
         result = await db.create_analyzer(analyzer_name, "geo_s2", properties={})
         assert result["type"] == "geo_s2"

tests/test_backup.py

@@ -6,10 +6,8 @@
 
 
 @pytest.mark.asyncio
-async def test_backup(
-    url, sys_db_name, bad_db, token, enterprise, cluster, db_version, skip_tests
-):
-    if not enterprise:
+async def test_backup(url, sys_db_name, bad_db, token, cluster, db_version, skip_tests):
+    if "enterprise" in skip_tests:
         pytest.skip("Backup API is only available in ArangoDB Enterprise Edition")
     if not cluster:
         pytest.skip("For simplicity, the backup API is only tested in cluster setups")

tests/test_client.py

@@ -121,14 +121,14 @@ async def test_client_jwt_auth(url, sys_db_name, basic_auth_root):
 
 @pytest.mark.asyncio
 async def test_client_jwt_superuser_auth(
-    url, sys_db_name, basic_auth_root, token, enterprise, skip_tests
+    url, sys_db_name, basic_auth_root, token, skip_tests
 ):
     # successful authentication
     async with ArangoClient(hosts=url) as client:
         db = await client.db(
             sys_db_name, auth_method="superuser", token=token, verify=True
         )
-        if enterprise:
+        if "enterprise" not in skip_tests:
             await db.jwt_secrets()
             if "jwt-secret-keyfile" not in skip_tests:
                 await db.reload_jwt_secrets()

tests/test_cluster.py

@@ -15,11 +15,11 @@
 
 @pytest.mark.asyncio
 async def test_cluster(
-    url, sys_db_name, bad_db, token, enterprise, cluster, db_version
+    url, sys_db_name, bad_db, token, skip_tests, cluster, db_version
 ):
     if not cluster:
         pytest.skip("Cluster API is only tested in cluster setups")
-    if not enterprise or db_version < version.parse("3.12.0"):
+    if "enterprise" in skip_tests or db_version < version.parse("3.12.0"):
         pytest.skip(
             "For simplicity, the cluster API is only tested in the latest versions"
         )

tests/test_database.py

@@ -59,7 +59,7 @@
 
 @pytest.mark.asyncio
 async def test_database_misc_methods(
-    sys_db, db, bad_db, cluster, db_version, url, sys_db_name, token, enterprise
+    sys_db, db, bad_db, cluster, db_version, url, sys_db_name, token, skip_tests
 ):
     # Status
     status = await sys_db.status()
@@ -181,7 +181,7 @@ async def test_database_misc_methods(
     response = await sys_db.request(request)
     assert json.loads(response.raw_body) == 1
 
-    if enterprise and db_version >= version.parse("3.12.0"):
+    if "enterprise" not in skip_tests and db_version >= version.parse("3.12.0"):
         # API calls
         with pytest.raises(ServerApiCallsError):
             await bad_db.api_calls()

tests/test_graph.py

@@ -56,10 +56,10 @@ async def test_graph_basic(db, bad_db):
 
 
 @pytest.mark.asyncio
-async def test_graph_properties(db, bad_graph, cluster, enterprise):
+async def test_graph_properties(db, bad_graph, cluster, skip_tests):
     # Create a graph
     name = generate_graph_name()
-    is_smart = cluster and enterprise
+    is_smart = cluster and "enterprise" in skip_tests
     options = GraphOptions(number_of_shards=3)
     graph = await db.create_graph(name, is_smart=is_smart, options=options)