[7.x] Re-enable session lifespan, idle timeout api integration tests …

…and use unique names for the security test reports. (#77859)
elastic · Sep 18, 2020 · 31cb622 · 31cb622
1 parent 5bcc433
commit 31cb622
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 18 deletions.
diff --git a/x-pack/test/api_integration/config_security_basic.ts b/x-pack/test/api_integration/config_security_basic.ts
@@ -19,6 +19,7 @@ export default async function (context: FtrConfigProviderContext) {
       'xpack.security.authc.api_key.enabled=true',
     ];
     config.testFiles = [require.resolve('./apis/security/security_basic')];
+    config.junit.reportName = 'X-Pack API Integration Tests (Security Basic)';
     return config;
   });
 }
diff --git a/x-pack/test/api_integration/config_security_trial.ts b/x-pack/test/api_integration/config_security_trial.ts
@@ -12,6 +12,7 @@ import { default as createTestConfig } from './config';
 export default async function (context: FtrConfigProviderContext) {
   return createTestConfig(context).then((config) => {
     config.testFiles = [require.resolve('./apis/security/security_trial')];
+    config.junit.reportName = 'X-Pack API Integration Tests (Security Trial)';
     return config;
   });
 }
diff --git a/x-pack/test/functional/config_security_basic.ts b/x-pack/test/functional/config_security_basic.ts
@@ -70,7 +70,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
 
     junit: {
-      reportName: 'Chrome X-Pack UI Functional Tests',
+      reportName: 'Chrome X-Pack UI Functional Tests (Security Basic)',
     },
   };
 }
diff --git a/x-pack/test/security_api_integration/session_idle.config.ts b/x-pack/test/security_api_integration/session_idle.config.ts
@@ -36,7 +36,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
 
     junit: {
-      reportName: 'X-Pack Security API Integration Tests',
+      reportName: 'X-Pack Security API Integration Tests (Session Idle Timeout)',
     },
   };
 }
diff --git a/x-pack/test/security_api_integration/session_lifespan.config.ts b/x-pack/test/security_api_integration/session_lifespan.config.ts
@@ -36,7 +36,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
 
     junit: {
-      reportName: 'X-Pack Security API Integration Tests',
+      reportName: 'X-Pack Security API Integration Tests (Session Lifespan)',
     },
   };
 }
diff --git a/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts b/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
@@ -33,15 +33,11 @@ export default function ({ getService }: FtrProviderContext) {
     return (await es.search({ index: '.kibana_security_session*' })).hits.total.value;
   }
 
-  // FLAKY: https://github.com/elastic/kibana/issues/76239
-  describe.skip('Session Idle cleanup', () => {
+  describe('Session Idle cleanup', () => {
     beforeEach(async () => {
       await es.cluster.health({ index: '.kibana_security_session*', waitForStatus: 'green' });
-      await es.deleteByQuery({
+      await es.indices.delete({
         index: '.kibana_security_session*',
-        q: '*',
-        waitForCompletion: true,
-        refresh: true,
         ignore: [404],
       });
     });

diff --git a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
@@ -30,15 +30,11 @@ export default function ({ getService }: FtrProviderContext) {
     return (await es.search({ index: '.kibana_security_session*' })).hits.total.value;
   }
 
-  // FLAKY: https://github.com/elastic/kibana/issues/76223
-  describe.skip('Session Lifespan cleanup', () => {
+  describe('Session Lifespan cleanup', () => {
     beforeEach(async () => {
       await es.cluster.health({ index: '.kibana_security_session*', waitForStatus: 'green' });
-      await es.deleteByQuery({
+      await es.indices.delete({
         index: '.kibana_security_session*',
-        q: '*',
-        waitForCompletion: true,
-        refresh: true,
         ignore: [404],
       });
     });

diff --git a/x-pack/test/security_functional/login_selector.config.ts b/x-pack/test/security_functional/login_selector.config.ts
@@ -76,7 +76,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     screenshots: { directory: resolve(__dirname, 'screenshots') },
 
     junit: {
-      reportName: 'Chrome X-Pack Security Functional Tests',
+      reportName: 'Chrome X-Pack Security Functional Tests (Login Selector)',
     },
   };
 }
diff --git a/x-pack/test/security_functional/oidc.config.ts b/x-pack/test/security_functional/oidc.config.ts
@@ -76,7 +76,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     screenshots: { directory: resolve(__dirname, 'screenshots') },
 
     junit: {
-      reportName: 'Chrome X-Pack Security Functional Tests',
+      reportName: 'Chrome X-Pack Security Functional Tests (OpenID Connect)',
     },
   };
 }
diff --git a/x-pack/test/security_functional/saml.config.ts b/x-pack/test/security_functional/saml.config.ts
@@ -70,7 +70,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     screenshots: { directory: resolve(__dirname, 'screenshots') },
 
     junit: {
-      reportName: 'Chrome X-Pack Security Functional Tests',
+      reportName: 'Chrome X-Pack Security Functional Tests (SAML)',
     },
   };
 }