[Fleet] Fix Fleet API integration tests (#96837) (#96994)

# Conflicts: # x-pack/scripts/functional_tests.js
elastic · Apr 13, 2021 · 558acf5 · 558acf5
1 parent 0208b63
commit 558acf5
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
@@ -71,8 +71,7 @@ require('@kbn/test').runTestsCli([
   require.resolve('../test/reporting_api_integration/reporting_and_security.config.ts'),
   require.resolve('../test/reporting_api_integration/reporting_without_security.config.ts'),
   require.resolve('../test/security_solution_endpoint_api_int/config.ts'),
-  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/96515
-  // require.resolve('../test/fleet_api_integration/config.ts'),
+  require.resolve('../test/fleet_api_integration/config.ts'),
   require.resolve('../test/functional_enterprise_search/without_host_configured.config.ts'),
   require.resolve('../test/functional_vis_wizard/config.ts'),
   require.resolve('../test/search_sessions_integration/config.ts'),

diff --git a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts
@@ -19,11 +19,13 @@ export default function (providerContext: FtrProviderContext) {
       await esArchiver.load('fleet/empty_fleet_server');
     });
     beforeEach(async () => {
+      await esArchiver.unload('fleet/empty_fleet_server');
       await esArchiver.load('fleet/agents');
     });
     setupFleetAndAgents(providerContext);
     afterEach(async () => {
       await esArchiver.unload('fleet/agents');
+      await esArchiver.load('fleet/empty_fleet_server');
     });
     after(async () => {
       await esArchiver.unload('fleet/empty_fleet_server');

diff --git a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
@@ -26,12 +26,15 @@ export default function (providerContext: FtrProviderContext) {
   describe('fleet upgrade', () => {
     skipIfNoDockerRegistry(providerContext);
     before(async () => {
-      await esArchiver.loadIfNeeded('fleet/agents');
+      await esArchiver.load('fleet/agents');
     });
     setupFleetAndAgents(providerContext);
     beforeEach(async () => {
       await esArchiver.load('fleet/agents');
     });
+    afterEach(async () => {
+      await esArchiver.unload('fleet/agents');
+    });
     after(async () => {
       await esArchiver.unload('fleet/agents');
     });

diff --git a/x-pack/test/fleet_api_integration/apis/agents_setup.ts b/x-pack/test/fleet_api_integration/apis/agents_setup.ts
@@ -24,7 +24,7 @@ export default function (providerContext: FtrProviderContext) {
 
     after(async () => {
       await esArchiver.unload('empty_kibana');
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.unload('fleet/empty_fleet_server');
     });
 
     beforeEach(async () => {

diff --git a/x-pack/test/fleet_api_integration/apis/epm/list.ts b/x-pack/test/fleet_api_integration/apis/epm/list.ts
@@ -26,7 +26,7 @@ export default function (providerContext: FtrProviderContext) {
     });
     setupFleetAndAgents(providerContext);
     after(async () => {
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.unload('fleet/empty_fleet_server');
     });
 
     describe('list api tests', async () => {

diff --git a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
@@ -24,7 +24,7 @@ export default function (providerContext: FtrProviderContext) {
 
     after(async () => {
       await esArchiver.unload('empty_kibana');
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.unload('fleet/empty_fleet_server');
     });
     beforeEach(async () => {
       try {

diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
@@ -3089,7 +3089,7 @@
       ".fleet-actions": {
       }
     },
-    "index": ".fleet-actions_1",
+    "index": ".fleet-actions-7",
     "mappings": {
       "_meta": {
         "migrationHash": "6527beea5a4a2f33acb599585ed4710442ece7f2"
@@ -3136,7 +3136,7 @@
       ".fleet-agents": {
       }
     },
-    "index": ".fleet-agents_1",
+    "index": ".fleet-agent-7",
     "mappings": {
       "_meta": {
         "migrationHash": "87cab95ac988d78a78d0d66bbf05361b65dcbacf"
@@ -3373,7 +3373,7 @@
       ".fleet-enrollment-api-keys": {
       }
     },
-    "index": ".fleet-enrollment-api-keys_1",
+    "index": ".fleet-enrollment-api-keys-7",
     "mappings": {
       "_meta": {
         "migrationHash": "06bef724726f3bea9f474a09be0a7f7881c28d4a"
@@ -3422,7 +3422,7 @@
       ".fleet-policies": {
       }
     },
-    "index": ".fleet-policies_1",
+    "index": ".fleet-policies-7",
     "mappings": {
       "_meta": {
         "migrationHash": "c2c2a49b19562942fa7c1ff1537e66e751cdb4fa"
@@ -3466,7 +3466,7 @@
       ".fleet-servers": {
       }
     },
-    "index": ".fleet-servers_1",
+    "index": ".fleet-servers-7",
     "mappings": {
       "_meta": {
         "migrationHash": "e2782448c7235ec9af66ca7997e867d715ac379c"

diff --git a/x-pack/test/functional/es_archives/fleet/empty_fleet_server/mappings.json b/x-pack/test/functional/es_archives/fleet/empty_fleet_server/mappings.json
@@ -5,7 +5,7 @@
       ".fleet-actions": {
       }
     },
-    "index": ".fleet-actions_1",
+    "index": ".fleet-actions-7",
     "mappings": {
       "_meta": {
         "migrationHash": "6527beea5a4a2f33acb599585ed4710442ece7f2"
@@ -52,7 +52,7 @@
       ".fleet-agents": {
       }
     },
-    "index": ".fleet-agents_1",
+    "index": ".fleet-agents-7",
     "mappings": {
       "_meta": {
         "migrationHash": "87cab95ac988d78a78d0d66bbf05361b65dcbacf"
@@ -289,7 +289,7 @@
       ".fleet-enrollment-api-keys": {
       }
     },
-    "index": ".fleet-enrollment-api-keys_1",
+    "index": ".fleet-enrollment-api-keys-7",
     "mappings": {
       "_meta": {
         "migrationHash": "06bef724726f3bea9f474a09be0a7f7881c28d4a"
@@ -338,7 +338,7 @@
       ".fleet-policies": {
       }
     },
-    "index": ".fleet-policies_1",
+    "index": ".fleet-policies-7",
     "mappings": {
       "_meta": {
         "migrationHash": "c2c2a49b19562942fa7c1ff1537e66e751cdb4fa"
@@ -382,7 +382,7 @@
       ".fleet-servers": {
       }
     },
-    "index": ".fleet-servers_1",
+    "index": ".fleet-servers-7",
     "mappings": {
       "_meta": {
         "migrationHash": "e2782448c7235ec9af66ca7997e867d715ac379c"