Use e3 pytest plugin

See AdaCore/e3-core#703 Remove conftest and coverage files coming from e3-core that are available in the e3 pytest plugin.
AdaCore · Apr 3, 2024 · b0306ea · b0306ea
1 parent e86e7e9
commit b0306ea
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 187 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -51,6 +51,17 @@ check = [
 [tool.setuptools.dynamic]
 version = {file = "VERSION"}
 
+[tool.coverage.report]
+exclude_also = [
+  "if tries < max_tries:"
+]
+
+[tool.coverage.run]
+branch = false
+
+[tool.coverage.html]
+title = "e3 aws coverage report"
+
 [tool.mypy]
 # Ensure mypy works with namespace in which there is no toplevel
 # __init__.py. Explicit_package_bases means that that mypy_path

diff --git a/src/e3/aws/dynamodb/__init__.py b/src/e3/aws/dynamodb/__init__.py
@@ -144,7 +144,9 @@ def batch_get_items(
                 res.extend(response.get("Responses", {table_name: []})[table_name])
                 logger.debug(f"Get_item response: {response}")
                 unprocessed = response["UnprocessedKeys"]
-                if len(unprocessed) > 0:
+                if len(unprocessed) > 0:  # all: no cover"
+                    # Testing this case is difficult as it requires a table
+                    # with more than 16MB of data
                     batch_keys = unprocessed
                     unprocessed_count = sum(
                         [len(batch_key["Keys"]) for batch_key in batch_keys.values()]  # type: ignore

diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/coverage/base.rc b/tests/coverage/base.rc
diff --git a/tests/coverage/darwin.rc b/tests/coverage/darwin.rc
diff --git a/tests/coverage/linux.rc b/tests/coverage/linux.rc
diff --git a/tests/coverage/windows.rc b/tests/coverage/windows.rc
diff --git a/tests/fix-coverage-paths.py b/tests/fix-coverage-paths.py
diff --git a/tests/gen-cov-config.py b/tests/gen-cov-config.py
diff --git a/tox.ini b/tox.ini
@@ -13,14 +13,10 @@ passenv = APPVEYOR*,CI,GITHUB_*,CODECOV_*
 
 # Run testsuite with coverage when '-cov' is in the env name
 commands=
-    {envpython} {toxinidir}/tests/gen-cov-config.py {toxinidir}/.coveragerc
-    py.test --ignore=build -vv \
+    pytest --ignore=build -vv --e3 \
+    cov: --e3-cov-rewrite {envsitepackagesdir} src \
     cov: --cov {envsitepackagesdir}/e3/aws --cov-report= --cov-fail-under=0 \
     []
-    cov: {envpython} {toxinidir}/tests/fix-coverage-paths.py \
-    cov:     {envsitepackagesdir} {toxinidir}/.coverage
-    cov: coverage html --fail-under=0
-    cov: coverage report
     codecov: codecov
 
 [testenv:check]
@@ -39,9 +35,6 @@ ignore = E123,E133,E241,E242,W503,W504
 [pydocstyle]
 ignore = D100,D101,D102,D102,D103,D104,D105,D203,D403,D213
 
-[pytest]
-addopts = --failed-first
-
 [flake8]
 exclude = .git,__pycache__,build,dist,.tox
 ignore = B905, C901, E203, E266, E501, W503,D100,D101,D102,D102,D103,D104,D105,D106,D107,D203,D403,D213