Merge branch '7.x' into backport/7.x/pr-71794

elastic · Jul 15, 2020 · 43d90a6 · 43d90a6
2 parents c487739 + 44b534c
commit 43d90a6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/x-pack/test/api_integration/apis/fleet/agent_flow.ts b/x-pack/test/api_integration/apis/fleet/agent_flow.ts
@@ -18,7 +18,7 @@ export default function (providerContext: FtrProviderContext) {
   const supertestWithoutAuth = getSupertestWithoutAuth(providerContext);
   const esClient = getService('es');
 
-  describe.skip('fleet_agent_flow', () => {
+  describe('fleet_agent_flow', () => {
     before(async () => {
       await esArchiver.load('empty_kibana');
     });

diff --git a/x-pack/test/api_integration/apis/fleet/agents/enroll.ts b/x-pack/test/api_integration/apis/fleet/agents/enroll.ts
@@ -21,9 +21,7 @@ export default function (providerContext: FtrProviderContext) {
   let apiKey: { id: string; api_key: string };
   let kibanaVersion: string;
 
-  // Temporarily skipped to promote snapshot
-  // Re-enabled in https://github.com/elastic/kibana/pull/71727
-  describe.skip('fleet_agents_enroll', () => {
+  describe('fleet_agents_enroll', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('fleet/agents');
 

diff --git a/x-pack/test/api_integration/apis/fleet/index.js b/x-pack/test/api_integration/apis/fleet/index.js
@@ -5,7 +5,9 @@
  */
 
 export default function loadTests({ loadTestFile }) {
-  describe('Fleet Endpoints', () => {
+  // Temporarily skipped to promote snapshot
+  // Re-enabled in https://github.com/elastic/kibana/pull/71727
+  describe.skip('Fleet Endpoints', () => {
     loadTestFile(require.resolve('./setup'));
     loadTestFile(require.resolve('./delete_agent'));
     loadTestFile(require.resolve('./list_agent'));

diff --git a/x-pack/test/api_integration/apis/fleet/setup.ts b/x-pack/test/api_integration/apis/fleet/setup.ts
@@ -11,9 +11,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const es = getService('es');
 
-  // Temporarily skipped to promote snapshot
-  // Re-enabled in https://github.com/elastic/kibana/pull/71727
-  describe.skip('fleet_setup', () => {
+  describe('fleet_setup', () => {
     beforeEach(async () => {
       try {
         await es.security.deleteUser({

diff --git a/x-pack/test/api_integration/apis/fleet/unenroll_agent.ts b/x-pack/test/api_integration/apis/fleet/unenroll_agent.ts
@@ -16,9 +16,7 @@ export default function (providerContext: FtrProviderContext) {
   const supertest = getService('supertest');
   const esClient = getService('es');
 
-  // Temporarily skipped to promote snapshot: https://github.com/elastic/kibana/issues/68587
-  // Re-enabled in https://github.com/elastic/kibana/pull/71727
-  describe.skip('fleet_unenroll_agent', () => {
+  describe('fleet_unenroll_agent', () => {
     let accessAPIKeyId: string;
     let outputAPIKeyId: string;
     before(async () => {