Merge pull request #621 from vespa-engine/jobergum/delete-app-after-test

vespa-engine · Nov 9, 2023 · 268bd79 · 268bd79
2 parents 70a3fab + 41fc12a
commit 268bd79
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/vespa/test_integration_vespa_cloud.py b/vespa/test_integration_vespa_cloud.py
@@ -3,6 +3,8 @@
 import os
 import asyncio
 import shutil
+import pytest
+from requests import HTTPError
 import unittest
 from cryptography.hazmat.primitives import serialization
 from vespa.application import Vespa
@@ -64,14 +66,16 @@ def test_key_cert_arguments(self):
             self.app.get_data(data_id="1").json,
         )
         self.assertEqual(self.app.get_data(data_id="1").is_successfull(), False)
+        with pytest.raises(HTTPError):
+            self.app.get_data(data_id="1",raise_on_not_found=True)
 
 
     def tearDown(self) -> None:
         self.app.delete_all_docs(
             content_cluster_name="msmarco_content", schema="msmarco"
         )
         shutil.rmtree(self.disk_folder, ignore_errors=True)
-        #self.vespa_cloud.delete()
+        self.vespa_cloud.delete()
 
 
 class TestMsmarcoApplication(TestApplicationCommon):

diff --git a/vespa/test_integration_vespa_cloud_token.py b/vespa/test_integration_vespa_cloud_token.py
@@ -4,6 +4,8 @@
 import asyncio
 import shutil
 import unittest
+import pytest
+from requests import HTTPError
 from vespa.application import Vespa
 from vespa.package import AuthClient, Parameter
 from vespa.deployment import VespaCloud
@@ -56,14 +58,16 @@ def test_right_endpoint_used_with_token(self):
             self.app.get_data(data_id="1").json,
         )
         self.assertEqual(self.app.get_data(data_id="1").is_successfull(), False)
+        with pytest.raises(HTTPError):
+            self.app.get_data(data_id="1",raise_on_not_found=True)
 
 
     def tearDown(self) -> None:
         self.app.delete_all_docs(
             content_cluster_name="msmarco_content", schema="msmarco"
         )
         shutil.rmtree(self.disk_folder, ignore_errors=True)
-        #self.vespa_cloud.delete()
+        self.vespa_cloud.delete()
 
 
 class TestMsmarcoApplicationWithTokenAuth(TestApplicationCommon):

diff --git a/vespa/test_integration_vespa_cloud_vector_search.py b/vespa/test_integration_vespa_cloud_vector_search.py
@@ -161,6 +161,6 @@ def tearDown(self) -> None:
             self.assertEqual(len(response.hits), 0)
             print(response.get_json())
         shutil.rmtree(self.disk_folder, ignore_errors=True)
-        #self.vespa_cloud.delete()
+        self.vespa_cloud.delete()