From 8e4ee0f2ec10a065d340fd7f1c08dc13ede99532 Mon Sep 17 00:00:00 2001 From: Timothy Sullivan Date: Wed, 23 Oct 2024 16:13:38 -0700 Subject: [PATCH] remove inessential differences --- .../test_suites/common/reporting/datastream.ts | 2 +- .../test_suites/common/reporting/management.ts | 2 +- .../functional/test_suites/common/reporting/management.ts | 6 +++--- x-pack/test_serverless/shared/services/svl_reporting.ts | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts b/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts index d004c3f11d785..671b42f5a02a3 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts @@ -20,8 +20,8 @@ export default function ({ getService }: FtrProviderContext) { const svlCommonApi = getService('svlCommonApi'); const supertestWithoutAuth = getService('supertestWithoutAuth'); const svlUserManager = getService('svlUserManager'); - let roleAuthc: RoleCredentials; const samlAuth = getService('samlAuth'); + let roleAuthc: RoleCredentials; let cookieCredentials: CookieCredentials; let internalReqHeader: InternalRequestHeader; diff --git a/x-pack/test_serverless/api_integration/test_suites/common/reporting/management.ts b/x-pack/test_serverless/api_integration/test_suites/common/reporting/management.ts index e63479e0e7774..ad1088ae0ebd2 100644 --- a/x-pack/test_serverless/api_integration/test_suites/common/reporting/management.ts +++ b/x-pack/test_serverless/api_integration/test_suites/common/reporting/management.ts @@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => { }, }; - describe('Management: Deletion', function () { + describe('Reporting Management', function () { let reportJob: ReportApiJSON; let path: string; diff --git a/x-pack/test_serverless/functional/test_suites/common/reporting/management.ts b/x-pack/test_serverless/functional/test_suites/common/reporting/management.ts index 536b1ecaf4eb0..35a1d1ec1872f 100644 --- a/x-pack/test_serverless/functional/test_suites/common/reporting/management.ts +++ b/x-pack/test_serverless/functional/test_suites/common/reporting/management.ts @@ -35,7 +35,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { }); }; - describe('Management: listing', function () { + describe('Reporting Management app', function () { // security_exception: action [indices:admin/create] is unauthorized for user [elastic] with effective roles [superuser] on restricted indices [.reporting-2020.04.19], this action is granted by the index privileges [create_index,manage,all] this.tags('failsOnMKI'); @@ -59,7 +59,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { }; // Kibana CI and MKI use different users - before(async () => { + before('initialize saved object archive', async () => { cookieCredentials = await samlAuth.getM2MApiCookieCredentialsWithRoleScope('admin'); internalReqHeader = samlAuth.getInternalRequestHeader(); // add test saved search object @@ -77,7 +77,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { reportJob = result.job; }); - after(async () => { + after('clean up archives', async () => { await kibanaServer.importExport.unload(savedObjectsArchive); await reportingAPI.waitForJobToFinish(path, cookieCredentials, internalReqHeader); }); diff --git a/x-pack/test_serverless/shared/services/svl_reporting.ts b/x-pack/test_serverless/shared/services/svl_reporting.ts index e87676d72409c..305b308658887 100644 --- a/x-pack/test_serverless/shared/services/svl_reporting.ts +++ b/x-pack/test_serverless/shared/services/svl_reporting.ts @@ -61,7 +61,6 @@ export function SvlReportingServiceProvider({ getService }: FtrProviderContext) internalReqHeader: InternalRequestHeader, options?: { timeout?: number } ) { - log.debug(`ReportingAPI.waitForJobToFinish ${downloadReportPath}`); await retry.waitForWithTimeout( `job ${downloadReportPath} finished`, options?.timeout ?? config.get('timeouts.kibanaReportCompletion'),