updates to tests

Author: jtsodapop

tests/conftest.py

@@ -0,0 +1,23 @@
+from datetime import datetime
+from random import randint
+from string import ascii_letters
+
+import pytest
+
+
+@pytest.fixture
+def rand_gen():
+
+    def gen(field_type):
+        if field_type is str:
+            return "".join(ascii_letters[randint(0,
+                                                 len(ascii_letters) - 1)]
+                           for _ in range(16))
+
+        if field_type is datetime:
+            return datetime.now()
+
+        raise Exception("Can't random generate for field type '%r'" %
+                        field_type)
+
+    return gen

tests/integration/conftest.py

@@ -134,23 +134,6 @@ def image_url(client):
     return client.upload_data(requests.get(IMG_URL).content, sign=True)
 
 
-@pytest.fixture
-def rand_gen():
-
-    def gen(field_type):
-        if field_type is str:
-            return "".join(ascii_letters[randint(0,
-                                                 len(ascii_letters) - 1)]
-                           for _ in range(16))
-
-        if field_type is datetime:
-            return datetime.now()
-
-        raise Exception("Can't random generate for field type '%r'" %
-                        field_type)
-
-    return gen
-
 
 @pytest.fixture
 def project(client, rand_gen):
@@ -258,15 +241,13 @@ def configured_project(project, client, rand_gen, image_url):
 
 
 @pytest.fixture
-def configured_project_with_label(client, rand_gen, image_url):
+def configured_project_with_label(client, rand_gen, image_url, project, dataset, datarow):
     """Project with a connected dataset, having one datarow
     Project contains an ontology with 1 bbox tool
     Additionally includes a create_label method for any needed extra labels
     One label is already created and yielded when using fixture
     """
-    project = client.create_project(name=rand_gen(str))
-    dataset = client.create_dataset(name=rand_gen(str), projects=project)
-    data_row = dataset.create_data_row(row_data=image_url)
+    project.datasets.connect(dataset)
     editor = list(
         project.client.get_labeling_frontends(
             where=LabelingFrontend.name == "editor"))[0]
@@ -280,7 +261,7 @@ def configured_project_with_label(client, rand_gen, image_url):
         "uuid": str(uuid.uuid4()),
         "schemaId": ontology.tools[0].feature_schema_id,
         "dataRow": {
-            "id": data_row.uid
+            "id": datarow.uid
         },
         "bbox": {
             "top": 20,
@@ -302,10 +283,7 @@ def create_label():
     project.create_label = create_label
     project.create_label()
     label = next(project.labels())
-    yield [project, dataset, data_row, label]
-    dataset.delete()
-    project.delete()
-    data_row.delete()
+    yield [project, dataset, datarow, label]
 
     for label in project.labels():
         label.delete()

tests/integration/test_label.py

@@ -18,9 +18,6 @@ def test_labels(configured_project_with_label):
 
     label.delete()
 
-    # Labels are not visible in the project immediately.
-    time.sleep(5)
-
     assert list(project.labels()) == []
     assert list(data_row.labels()) == []
 

tests/integration/test_ontology.py

@@ -5,7 +5,11 @@
 import json
 import time
 
-
+@pytest.mark.skip(reason="normalized ontology contains Relationship, "
+    "which is not finalized yet. introduce this back when"
+    "Relationship feature is complete and we introduce"
+    "a Relationship object to the ontology that we can parse"
+    )
 def test_from_project_ontology(project) -> None:
     o = OntologyBuilder.from_project(project)
     assert o.asdict() == project.ontology().normalized

tests/integration/test_review.py

@@ -10,9 +10,6 @@ def test_reviews(configured_project_with_label):
     assert set(label.reviews()) == set()
 
     r1 = label.create_review(score=-1.0)
-    # They work on data that was created in the editor but not with project.create_label
-    # assert r1.project() == project
-    # assert r1.label() == label
     assert r1.score == -1.0
     assert set(label.reviews()) == {r1}
 

tests/unit/conftest.py

@@ -1,25 +1,25 @@
-from datetime import datetime
-from random import randint
-from string import ascii_letters
+# from datetime import datetime
+# from random import randint
+# from string import ascii_letters
 
-import pytest
+# import pytest
 
-IMG_URL = "https://picsum.photos/200/300"
+# IMG_URL = "https://picsum.photos/200/300"
 
 
-@pytest.fixture
-def rand_gen():
+# @pytest.fixture
+# def rand_gen():
 
-    def gen(field_type):
-        if field_type is str:
-            return "".join(ascii_letters[randint(0,
-                                                 len(ascii_letters) - 1)]
-                           for _ in range(16))
+#     def gen(field_type):
+#         if field_type is str:
+#             return "".join(ascii_letters[randint(0,
+#                                                  len(ascii_letters) - 1)]
+#                            for _ in range(16))
 
-        if field_type is datetime:
-            return datetime.now()
+#         if field_type is datetime:
+#             return datetime.now()
 
-        raise Exception("Can't random generate for field type '%r'" %
-                        field_type)
+#         raise Exception("Can't random generate for field type '%r'" %
+#                         field_type)
 
-    return gen
+#     return gen