fix api integration test

elastic · Feb 21, 2022 · 6002821 · 6002821
1 parent 69a5cc6
commit 6002821
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts b/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts
@@ -32,7 +32,7 @@ export default function ({ getService }: FtrProviderContext) {
       };
 
       // wait for the the pending job to complete
-      await reportingAPI.waitForJobToFinish(downloadPath);
+      await reportingAPI.waitForJobToFinish(downloadPath, true);
 
       expect(await reportingAPI.getJobErrorCode(report.id)).to.be('unknown_error');
 

diff --git a/x-pack/test/reporting_api_integration/services/scenarios.ts b/x-pack/test/reporting_api_integration/services/scenarios.ts
@@ -164,6 +164,7 @@ export function createScenarios({ getService }: Pick<FtrProviderContext, 'getSer
     password = process.env.TEST_KIBANA_PASS || 'changeme'
   ) => {
     const jobParams = rison.encode(job as object as RisonValue);
+
     return await supertestWithoutAuth
       .post(`/api/reporting/generate/csv_searchsource`)
       .auth(username, password)
@@ -191,10 +192,19 @@ export function createScenarios({ getService }: Pick<FtrProviderContext, 'getSer
     return response.text as unknown;
   };
 
-  const getJobErrorCode = async (id: string): Promise<undefined | string> => {
+  const getJobErrorCode = async (
+    id: string,
+    username = 'elastic',
+    password = process.env.TEST_KIBANA_PASS || 'changeme'
+  ): Promise<undefined | string> => {
     const {
       body: [job],
-    } = await supertest.get(`/api/reporting/jobs/?page=0&ids=${id}`);
+    } = await supertestWithoutAuth
+      .get(`/api/reporting/jobs/list?page=0&ids=${id}`)
+      .auth(username, password)
+      .set('kbn-xsrf', 'xxx')
+      .send()
+      .expect(200);
     return job?.output?.error_code;
   };
 

diff --git a/x-pack/test/reporting_api_integration/services/usage.ts b/x-pack/test/reporting_api_integration/services/usage.ts
@@ -42,7 +42,7 @@ export function createUsageServices({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   return {
-    async waitForJobToFinish(downloadReportPath: string) {
+    async waitForJobToFinish(downloadReportPath: string, ignoreFailure?: boolean) {
       log.debug(`Waiting for job to finish: ${downloadReportPath}`);
       const JOB_IS_PENDING_CODE = 503;
 
@@ -65,8 +65,9 @@ export function createUsageServices({ getService }: FtrProviderContext) {
           }
         }, 1500);
       });
-
-      expect(statusCode).to.be(200);
+      if (!ignoreFailure) {
+        expect(statusCode).to.be(200);
+      }
     },
 
     /**