Merge pull request #14776 from cdapio/cp_itn_fixes

[CDAP-20117] Cp itn fixes
cdapio · Nov 29, 2022 · 8393a04 · 8393a04
2 parents f91f4ef + 04592d0
commit 8393a04
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/cdap-integration-test/src/main/java/io/cdap/cdap/test/IntegrationTestBase.java b/cdap-integration-test/src/main/java/io/cdap/cdap/test/IntegrationTestBase.java
@@ -26,7 +26,6 @@
 import io.cdap.cdap.api.app.Application;
 import io.cdap.cdap.api.artifact.ArtifactScope;
 import io.cdap.cdap.api.artifact.ArtifactSummary;
-import io.cdap.cdap.api.security.AccessException;
 import io.cdap.cdap.cli.util.InstanceURIParser;
 import io.cdap.cdap.client.ApplicationClient;
 import io.cdap.cdap.client.ArtifactClient;
@@ -40,6 +39,7 @@
 import io.cdap.cdap.client.config.ConnectionConfig;
 import io.cdap.cdap.client.util.RESTClient;
 import io.cdap.cdap.common.ApplicationNotFoundException;
+import io.cdap.cdap.common.DatasetNotFoundException;
 import io.cdap.cdap.common.conf.CConfiguration;
 import io.cdap.cdap.common.conf.Constants;
 import io.cdap.cdap.data2.datafabric.DefaultDatasetNamespace;
@@ -366,21 +366,24 @@ protected DatasetClient getDatasetClient() {
 
   protected ApplicationManager deployApplication(NamespaceId namespace,
                                                  Class<? extends Application> applicationClz,
-                                                 File...bundleEmbeddedJars) throws IOException, AccessException {
+                                                 File...bundleEmbeddedJars) throws Exception {
+    checkSystemServices();
     return getTestManager().deployApplication(namespace, applicationClz, bundleEmbeddedJars);
   }
 
   protected ApplicationManager deployApplication(Class<? extends Application> applicationClz)
-    throws IOException, AccessException {
+    throws Exception {
     return deployApplication(getConfiguredNamespace(), applicationClz);
   }
 
 
   protected ApplicationManager deployApplication(ApplicationId appId, AppRequest appRequest) throws Exception {
+    checkSystemServices();
     return getTestManager().deployApplication(appId, appRequest);
   }
 
   protected ArtifactManager addAppArtifact(ArtifactId artifactId, Class<?> appClass) throws Exception {
+    checkSystemServices();
     return getTestManager().addAppArtifact(artifactId, appClass);
   }
 
@@ -407,7 +410,11 @@ private void doClear(NamespaceId namespace, boolean deleteNamespace) throws Exce
     }
     // delete all dataset instances
     for (DatasetSpecificationSummary datasetSpecSummary : getDatasetClient().list(namespace)) {
-      getDatasetClient().delete(namespace.dataset(datasetSpecSummary.getName()));
+      try {
+        getDatasetClient().delete(namespace.dataset(datasetSpecSummary.getName()));
+      } catch (DatasetNotFoundException e) {
+        // No action needed. 
+      }
     }
     ArtifactClient artifactClient = new ArtifactClient(getClientConfig(), getRestClient());
     for (ArtifactSummary artifactSummary : artifactClient.list(namespace, ArtifactScope.USER)) {