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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable previously-flaky tests #2583

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Re-enable previously-flaky tests #2583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
47f9124
Re-enabled enterprise test_pytorch.py
nvoxland Sep 6, 2023
323ac67
Re-enabled test_pytorch.py
nvoxland Sep 6, 2023
d29d35b
Revert "Re-enabled test_pytorch.py"
nvoxland Sep 6, 2023
1423db8
Re-enable enterprise tensorflow
nvoxland Sep 6, 2023
813f210
Re-enabled test_data_ingestion.py
nvoxland Sep 6, 2023
c0f2eaf
Run tests on draft PRs
nvoxland Sep 8, 2023
fa8065e
Revert "Re-enabled test_data_ingestion.py"
nvoxland Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test-push.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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