Added integration test

Author: Tim-Kerr

labelbox/client.py

@@ -931,7 +931,6 @@ def delete_unused_ontology(self, ontology_id: str) -> None:
         Example:
             >>> client.delete_unused_ontology("cleabc1my012ioqvu5anyaabc")
         """
-
         endpoint = self.rest_endpoint + "/ontologies/" + urllib.parse.quote(
             ontology_id)
         response = requests.delete(
@@ -1635,10 +1634,10 @@ def delete_feature_schema_from_ontology(
                 logger.info(
                     'Feature schema was archived from the ontology because it had associated labels.'
                 )
-                return response_json
             elif response_json['deleted'] == True:
                 logger.info(
                     'Feature schema was successfully removed from the ontology')
+            return response_json
         else:
             raise labelbox.exceptions.LabelboxError(
                 "Failed to remove feature schema from ontology, message: " +

tests/integration/conftest.py

@@ -11,7 +11,7 @@
 
 from labelbox import Client
 from labelbox import LabelingFrontend
-from labelbox import OntologyBuilder, Tool, Option, Classification
+from labelbox import OntologyBuilder, Tool, Option, Classification, MediaType
 from labelbox.orm import query
 from labelbox.pagination import PaginatedCollection
 from labelbox.schema.annotation_import import LabelImport
@@ -524,4 +524,34 @@ def func(project):
                 )
             time.sleep(2)
 
-    return func
+    return func  
+
+@pytest.fixture
+def ontology(client):
+    ontology_builder = OntologyBuilder(
+        tools=[
+            Tool(
+                tool=Tool.Type.BBOX,
+                name="Box 1",
+                color="#ff0000"
+            ),
+            Tool(
+                tool=Tool.Type.BBOX,
+                name="Box 2",
+                color="#ff0000"
+            )
+        ],
+        classifications=[
+            Classification(
+                name="Root Class",
+                class_type=Classification.Type.RADIO,
+                options=[
+                    Option(value="1", label="Option 1"),
+                    Option(value="2", label="Option 2")
+                ]
+            )
+        ]
+    )
+    ontology = client.create_ontology('Integration Test Ontology', ontology_builder.asdict(), MediaType.Image)
+    yield ontology
+    client.delete_unused_ontology(ontology.uid)

tests/integration/test_ontology.py

@@ -5,6 +5,12 @@
 import json
 import time
 
+def test_delete_tool_feature_from_ontology(client, ontology):
+    feature_schema_to_delete = ontology.normalized['tools'][0]
+    result = client.delete_feature_schema_from_ontology(ontology.uid, feature_schema_to_delete['featureSchemaId'])  
+    assert result['deleted'] == True 
+    assert result['archived'] == False
+
 
 @pytest.mark.skip(reason="normalized ontology contains Relationship, "
                   "which is not finalized yet. introduce this back when"
@@ -21,7 +27,6 @@ def test_from_project_ontology(project) -> None:
     color="#ff0000",
 )
 
-
 def test_deletes_an_ontology(client):
     tool = client.upsert_feature_schema(point.asdict())
     feature_schema_id = tool.normalized['featureSchemaId']
@@ -34,7 +39,6 @@ def test_deletes_an_ontology(client):
 
     client.delete_unused_feature_schema(feature_schema_id)
 
-
 def test_cant_delete_an_ontology_with_project(client):
     project = client.create_project(name="test project",
                                     media_type=MediaType.Image)