diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index a24652fc..9a3d2ecc 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -43,10 +43,10 @@ jobs: env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_TEST_TOKEN }} - run: twine upload --repository testpypi dist/* + run: twine upload --verbose --repository testpypi dist/* - name: Publish to PyPI env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} - run: twine upload --repository pypi dist/* + run: twine upload --verbose --repository pypi dist/* diff --git a/arango/version.py b/arango/version.py index 323e30a4..8eef1052 100644 --- a/arango/version.py +++ b/arango/version.py @@ -1 +1 @@ -__version__ = "8.3.2" +__version__ = "8.3.3" diff --git a/tests/conftest.py b/tests/conftest.py index f3f77f21..f431cd04 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -46,6 +46,7 @@ class GlobalData: secret: str = None root_password: str = None db_version: version = version.parse("0.0.0") + is_instrumented: bool = False crash: bool = False @@ -138,6 +139,9 @@ def pytest_configure(config): ) db_version = sys_db.version() + global_data.is_instrumented = ( + "asan" in db_version or "tsan" in db_version or "coverage" in db_version + ) global_data.db_version = version.parse(db_version.split("-")[0]) # Create a user and non-system database for testing. @@ -298,6 +302,11 @@ def db_version(): return global_data.db_version +@pytest.fixture(autouse=False) +def is_instrumented(): + return global_data.is_instrumented + + @pytest.fixture(autouse=False) def url(): return global_data.url diff --git a/tests/test_collection.py b/tests/test_collection.py index 02739450..058f923a 100644 --- a/tests/test_collection.py +++ b/tests/test_collection.py @@ -40,7 +40,7 @@ def test_collection_attributes(db, col, username): assert repr(col) == f"" -def test_collection_misc_methods(col, bad_col, cluster, db_version): +def test_collection_misc_methods(col, bad_col, cluster, db_version, is_instrumented): # Test get properties properties = col.properties() assert properties["name"] == col.name @@ -65,11 +65,8 @@ def test_collection_misc_methods(col, bad_col, cluster, db_version): } ] - with pytest.raises(ValueError): - # schema must not be empty - properties = col.configure( - sync=not prev_sync, schema={}, computed_values=computed_values - ) + sleep_time = 9 if is_instrumented else 3 + time.sleep(sleep_time) # Avoid "precondition failed" in slow clusters properties = col.configure(sync=not prev_sync, computed_values=computed_values) @@ -77,6 +74,8 @@ def test_collection_misc_methods(col, bad_col, cluster, db_version): assert properties["system"] is False assert properties["sync"] is not prev_sync assert properties["computedValues"] == computed_values + + time.sleep(sleep_time) # Avoid "precondition failed" in slow clusters col.configure(computed_values=[]) # Test configure properties with bad collection