Skip to content

Commit 4f6d873

Browse files
authored
Merge pull request #731 from Labelbox/mkozik/adjust-integration-tests
[X-0] Adjust integration tests to explicitly define queue mode
2 parents c7b0623 + ee996ac commit 4f6d873

File tree

5 files changed

+27
-12
lines changed

5 files changed

+27
-12
lines changed

tests/integration/annotation_import/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ def ontology():
125125

126126
@pytest.fixture
127127
def configured_project(client, ontology, rand_gen, image_url):
128-
project = client.create_project(name=rand_gen(str))
128+
project = client.create_project(name=rand_gen(str),
129+
queue_mode=QueueMode.Dataset)
129130
dataset = client.create_dataset(name=rand_gen(str))
130131
editor = list(
131132
client.get_labeling_frontends(
@@ -143,7 +144,8 @@ def configured_project(client, ontology, rand_gen, image_url):
143144

144145
@pytest.fixture
145146
def configured_project_pdf(client, ontology, rand_gen, pdf_url):
146-
project = client.create_project(name=rand_gen(str))
147+
project = client.create_project(name=rand_gen(str),
148+
queue_mode=QueueMode.Dataset)
147149
dataset = client.create_dataset(name=rand_gen(str))
148150
editor = list(
149151
client.get_labeling_frontends(

tests/integration/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ def pdf_url(client):
161161

162162
@pytest.fixture
163163
def project(client, rand_gen):
164-
project = client.create_project(name=rand_gen(str))
164+
project = client.create_project(name=rand_gen(str),
165+
queue_mode=QueueMode.Dataset)
165166
yield project
166167
project.delete()
167168

@@ -348,7 +349,8 @@ def create_label():
348349

349350
@pytest.fixture
350351
def configured_project_with_complex_ontology(client, rand_gen, image_url):
351-
project = client.create_project(name=rand_gen(str))
352+
project = client.create_project(name=rand_gen(str),
353+
queue_mode=QueueMode.Dataset)
352354
dataset = client.create_dataset(name=rand_gen(str), projects=project)
353355
data_row = dataset.create_data_row(row_data=image_url)
354356
editor = list(

tests/integration/test_filtering.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
from labelbox import Project
44
from labelbox.exceptions import InvalidQueryError
5+
from labelbox.schema.queue_mode import QueueMode
56

67

78
# Avoid assertions using equality to prevent intermittent failures due to
89
# other builds simultaneously adding projects to test org
910
def test_where(client):
10-
p_a = client.create_project(name="a")
11-
p_b = client.create_project(name="b")
12-
p_c = client.create_project(name="c")
11+
p_a = client.create_project(name="a", queue_mode=QueueMode.Dataset)
12+
p_b = client.create_project(name="b", queue_mode=QueueMode.Dataset)
13+
p_c = client.create_project(name="c", queue_mode=QueueMode.Dataset)
1314

1415
def _get(f, where=None):
1516
date_where = Project.created_at >= p_a.created_at

tests/integration/test_relationships.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import pytest
22

33
from labelbox.exceptions import InvalidQueryError
4+
from labelbox.schema.queue_mode import QueueMode
45

56

67
def test_project_dataset(client, rand_gen):
7-
project = client.create_project(name=rand_gen(str))
8+
project = client.create_project(name=rand_gen(str),
9+
queue_mode=QueueMode.Dataset)
810
dataset = client.create_dataset(name=rand_gen(str))
911

1012
assert len(list(project.datasets())) == 0
@@ -17,7 +19,8 @@ def test_project_dataset(client, rand_gen):
1719
assert {ds.uid for ds in project.datasets()} == {dataset.uid}
1820
assert {pr.uid for pr in dataset.projects()} == {project.uid}
1921

20-
project_2 = client.create_project(name=rand_gen(str))
22+
project_2 = client.create_project(name=rand_gen(str),
23+
queue_mode=QueueMode.Dataset)
2124

2225
# Currently it's not possible to connect a project and dataset
2326
# by updating dataset.

tests/integration/test_sorting.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
import pytest
22

33
from labelbox import Project
4+
from labelbox.schema.queue_mode import QueueMode
45

56

67
@pytest.mark.xfail(reason="Relationship sorting not implemented correctly "
78
"on the server-side")
89
def test_relationship_sorting(client):
9-
a = client.create_project(name="a", description="b")
10-
b = client.create_project(name="b", description="c")
11-
c = client.create_project(name="c", description="a")
10+
a = client.create_project(name="a",
11+
description="b",
12+
queue_mode=QueueMode.Dataset)
13+
b = client.create_project(name="b",
14+
description="c",
15+
queue_mode=QueueMode.Dataset)
16+
c = client.create_project(name="c",
17+
description="a",
18+
queue_mode=QueueMode.Dataset)
1219

1320
dataset = client.create_dataset(name="Dataset")
1421
a.datasets.connect(dataset)

0 commit comments

Comments
 (0)