diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml index 167742526b..67f12aa2ea 100644 --- a/.github/workflows/test-push.yml +++ b/.github/workflows/test-push.yml @@ -27,7 +27,6 @@ concurrency: jobs: setup: runs-on: ubuntu-latest - if: github.event_name == 'push' || (! github.event.pull_request.draft) outputs: matrix: ${{ steps.setup.outputs.matrix }} steps: diff --git a/deeplake/enterprise/test_pytorch.py b/deeplake/enterprise/test_pytorch.py index c2b7253dfa..cf49d91770 100644 --- a/deeplake/enterprise/test_pytorch.py +++ b/deeplake/enterprise/test_pytorch.py @@ -102,14 +102,13 @@ def test_offset_ds_iteration(local_auth_ds): [ pytest.param( "hub_cloud_ds", - marks=[pytest.mark.slow, pytest.mark.skip("Causing lockups")], + marks=[pytest.mark.slow], ), "local_auth_ds", ], indirect=True, ) @pytest.mark.flaky -@pytest.mark.skip("causing lockups") def test_pytorch_small(ds): with ds: ds.create_tensor("image", max_chunk_size=PYTORCH_TESTS_MAX_CHUNK_SIZE) @@ -171,7 +170,6 @@ def test_pytorch_small(ds): @pytest.mark.flaky(retry_count=3) @pytest.mark.slow @pytest.mark.timeout(10) -@pytest.mark.skip("causing lockups") def test_pytorch_transform(local_auth_ds): with local_auth_ds as ds: ds.create_tensor("image", max_chunk_size=PYTORCH_TESTS_MAX_CHUNK_SIZE) @@ -322,7 +320,6 @@ def test_custom_tensor_order(local_auth_ds): @requires_torch @requires_libdeeplake @pytest.mark.flaky -@pytest.mark.skip("causing lockups") @pytest.mark.timeout(10) def test_readonly_with_two_workers(local_auth_ds): with local_auth_ds as ds: @@ -577,13 +574,7 @@ def test_rename(local_auth_ds): @requires_torch @requires_libdeeplake -@pytest.mark.parametrize( - "num_workers", - [ - 0, - pytest.param(2, marks=pytest.mark.skip(reason="causing lockups")), - ], -) +@pytest.mark.parametrize("num_workers", [0, 2]) @pytest.mark.slow @pytest.mark.flaky def test_indexes(local_auth_ds, num_workers): @@ -604,13 +595,7 @@ def test_indexes(local_auth_ds, num_workers): @requires_torch @requires_libdeeplake @pytest.mark.slow -@pytest.mark.parametrize( - "num_workers", - [ - 0, - pytest.param(2, marks=pytest.mark.skip("causing lockups")), - ], -) +@pytest.mark.parametrize("num_workers", [0, 2]) @pytest.mark.flaky def test_indexes_transform(local_auth_ds, num_workers): with local_auth_ds as ds: @@ -635,9 +620,7 @@ def test_indexes_transform(local_auth_ds, num_workers): @requires_torch @requires_libdeeplake -@pytest.mark.parametrize( - "num_workers", [0, pytest.param(2, marks=pytest.mark.skip("causing lockups"))] -) +@pytest.mark.parametrize("num_workers", [0, 2]) @pytest.mark.slow @pytest.mark.flaky def test_indexes_transform_dict(local_auth_ds, num_workers): @@ -671,9 +654,7 @@ def test_indexes_transform_dict(local_auth_ds, num_workers): @requires_torch @requires_libdeeplake -@pytest.mark.parametrize( - "num_workers", [0, pytest.param(2, marks=pytest.mark.skip("causing lockups"))] -) +@pytest.mark.parametrize("num_workers", [0, 2]) @pytest.mark.slow @pytest.mark.flaky def test_indexes_tensors(local_auth_ds, num_workers): diff --git a/deeplake/enterprise/test_tensorflow.py b/deeplake/enterprise/test_tensorflow.py index a955ef0156..eb3680703e 100644 --- a/deeplake/enterprise/test_tensorflow.py +++ b/deeplake/enterprise/test_tensorflow.py @@ -53,7 +53,6 @@ def index_transform(sample): @requires_libdeeplake @pytest.mark.slow @pytest.mark.flaky -@pytest.mark.skip("causing lockups") def test_tensorflow_small(local_auth_ds): with local_auth_ds as ds: ds.create_tensor("image", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE) @@ -119,7 +118,6 @@ def test_tensorflow_small(local_auth_ds): @requires_libdeeplake @pytest.mark.slow @pytest.mark.flaky -@pytest.mark.skip("causing lockups") def test_tensorflow_transform(local_auth_ds): with local_auth_ds as ds: ds.create_tensor("image", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE) @@ -277,7 +275,6 @@ def test_custom_tensor_order(local_auth_ds): @requires_libdeeplake @pytest.mark.slow @pytest.mark.flaky -@pytest.mark.skip("causing lockups") def test_readonly_with_two_workers(local_auth_ds): local_auth_ds.create_tensor("images", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE) local_auth_ds.create_tensor("labels", max_chunk_size=TF_TESTS_MAX_CHUNK_SIZE) @@ -540,13 +537,7 @@ def test_rename(local_auth_ds): @requires_tensorflow @requires_libdeeplake -@pytest.mark.parametrize( - "num_workers", - [ - 0, - pytest.param(2, marks=pytest.mark.skip("causing lockups")), - ], -) +@pytest.mark.parametrize("num_workers", [0, 2]) @pytest.mark.slow @pytest.mark.flaky def test_indexes(local_auth_ds, num_workers): @@ -570,13 +561,7 @@ def test_indexes(local_auth_ds, num_workers): @requires_tensorflow @requires_libdeeplake -@pytest.mark.parametrize( - "num_workers", - [ - 0, - pytest.param(2, marks=pytest.mark.skip("causing lockups")), - ], -) +@pytest.mark.parametrize("num_workers", [0, 2]) @pytest.mark.slow @pytest.mark.flaky def test_indexes_transform(local_auth_ds, num_workers): @@ -645,9 +630,7 @@ def test_indexes_transform_dict(local_auth_ds, num_workers): @requires_tensorflow @requires_libdeeplake -@pytest.mark.parametrize( - "num_workers", [0, pytest.param(2, marks=pytest.mark.skip("causing lockups"))] -) +@pytest.mark.parametrize("num_workers", [0, 2]) @pytest.mark.slow @pytest.mark.flaky def test_indexes_tensors(local_auth_ds, num_workers):