Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable previously-flaky tests #2583

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
29 changes: 5 additions & 24 deletions deeplake/enterprise/test_pytorch.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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):
Expand All @@ -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:
Expand All @@ -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):
Expand Down Expand Up @@ -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):
Expand Down
23 changes: 3 additions & 20 deletions deeplake/enterprise/test_tensorflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -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):
Expand Down
Loading