From 7120827f80e9f66fe007d701dbce22adbfd45aed Mon Sep 17 00:00:00 2001
From: Sandra Gonzales <neptunian@users.noreply.github.com>
Date: Fri, 16 Oct 2020 09:18:18 -0400
Subject: [PATCH] [Ingest Manager] add skipIfNoDockerRegistry to
 package_install_complete test (#80779) (#80817)

* fix missing skipIfNoDockerRegistry

* skip afterEach if server doesn't exist
---
 .../apis/epm/data_stream.ts                   |  3 ++
 .../apis/epm/package_install_complete.ts      | 29 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/data_stream.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/data_stream.ts
index b9558240ca007..d1d909f773a2b 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/epm/data_stream.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/epm/data_stream.ts
@@ -12,6 +12,8 @@ export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const supertest = getService('supertest');
   const es = getService('es');
+  const dockerServers = getService('dockerServers');
+  const server = dockerServers.get('registry');
   const pkgName = 'datastreams';
   const pkgVersion = '0.1.0';
   const pkgUpdateVersion = '0.2.0';
@@ -63,6 +65,7 @@ export default function (providerContext: FtrProviderContext) {
       });
     });
     afterEach(async () => {
+      if (!server) return;
       await es.transport.request({
         method: 'DELETE',
         path: `/_data_stream/${logsTemplateName}-default`,
diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/package_install_complete.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/package_install_complete.ts
index 6b43c9d74c6bf..6fd4b64f0ee5e 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/epm/package_install_complete.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/epm/package_install_complete.ts
@@ -9,6 +9,7 @@ import {
   PACKAGES_SAVED_OBJECT_TYPE,
   MAX_TIME_COMPLETE_INSTALL,
 } from '../../../../plugins/ingest_manager/common';
+import { skipIfNoDockerRegistry } from '../../helpers';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 
 export default function (providerContext: FtrProviderContext) {
@@ -19,12 +20,14 @@ export default function (providerContext: FtrProviderContext) {
   const pkgVersion = '0.1.0';
   const pkgUpdateVersion = '0.2.0';
   describe('setup checks packages completed install', async () => {
+    skipIfNoDockerRegistry(providerContext);
     describe('package install', async () => {
       before(async () => {
         await supertest
           .post(`/api/fleet/epm/packages/${pkgName}-0.1.0`)
           .set('kbn-xsrf', 'xxxx')
-          .send({ force: true });
+          .send({ force: true })
+          .expect(200);
       });
       it('should have not reinstalled if package install completed', async function () {
         const packageBeforeSetup = await kibanaServer.savedObjects.get({
@@ -32,7 +35,7 @@ export default function (providerContext: FtrProviderContext) {
           id: pkgName,
         });
         const installStartedAtBeforeSetup = packageBeforeSetup.attributes.install_started_at;
-        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
+        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
         const packageAfterSetup = await kibanaServer.savedObjects.get({
           type: PACKAGES_SAVED_OBJECT_TYPE,
           id: pkgName,
@@ -51,7 +54,7 @@ export default function (providerContext: FtrProviderContext) {
             install_started_at: previousInstallDate,
           },
         });
-        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
+        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
         const packageAfterSetup = await kibanaServer.savedObjects.get({
           type: PACKAGES_SAVED_OBJECT_TYPE,
           id: pkgName,
@@ -71,7 +74,7 @@ export default function (providerContext: FtrProviderContext) {
             install_started_at: previousInstallDate,
           },
         });
-        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
+        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
         const packageAfterSetup = await kibanaServer.savedObjects.get({
           type: PACKAGES_SAVED_OBJECT_TYPE,
           id: pkgName,
@@ -83,7 +86,8 @@ export default function (providerContext: FtrProviderContext) {
       after(async () => {
         await supertest
           .delete(`/api/fleet/epm/packages/multiple_versions-0.1.0`)
-          .set('kbn-xsrf', 'xxxx');
+          .set('kbn-xsrf', 'xxxx')
+          .expect(200);
       });
     });
     describe('package update', async () => {
@@ -91,11 +95,13 @@ export default function (providerContext: FtrProviderContext) {
         await supertest
           .post(`/api/fleet/epm/packages/${pkgName}-0.1.0`)
           .set('kbn-xsrf', 'xxxx')
-          .send({ force: true });
+          .send({ force: true })
+          .expect(200);
         await supertest
           .post(`/api/fleet/epm/packages/${pkgName}-0.2.0`)
           .set('kbn-xsrf', 'xxxx')
-          .send({ force: true });
+          .send({ force: true })
+          .expect(200);
       });
       it('should have not reinstalled if package update completed', async function () {
         const packageBeforeSetup = await kibanaServer.savedObjects.get({
@@ -103,7 +109,7 @@ export default function (providerContext: FtrProviderContext) {
           id: pkgName,
         });
         const installStartedAtBeforeSetup = packageBeforeSetup.attributes.install_started_at;
-        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
+        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
         const packageAfterSetup = await kibanaServer.savedObjects.get({
           type: PACKAGES_SAVED_OBJECT_TYPE,
           id: pkgName,
@@ -124,7 +130,7 @@ export default function (providerContext: FtrProviderContext) {
             install_version: pkgUpdateVersion, // set version back
           },
         });
-        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
+        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
         const packageAfterSetup = await kibanaServer.savedObjects.get({
           type: PACKAGES_SAVED_OBJECT_TYPE,
           id: pkgName,
@@ -147,7 +153,7 @@ export default function (providerContext: FtrProviderContext) {
             version: pkgVersion, // set version back
           },
         });
-        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
+        await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
         const packageAfterSetup = await kibanaServer.savedObjects.get({
           type: PACKAGES_SAVED_OBJECT_TYPE,
           id: pkgName,
@@ -160,7 +166,8 @@ export default function (providerContext: FtrProviderContext) {
       after(async () => {
         await supertest
           .delete(`/api/fleet/epm/packages/multiple_versions-0.1.0`)
-          .set('kbn-xsrf', 'xxxx');
+          .set('kbn-xsrf', 'xxxx')
+          .expect(200);
       });
     });
   });