[Reporting] Re-enabled Chromium API tests (elastic#26789)

* [Reporting] Test logging * chromium api tests fixed * whitespace
tsullivan · Dec 7, 2018 · 65bfd31 · 65bfd31
1 parent 30de693
commit 65bfd31
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/x-pack/plugins/reporting/server/routes/jobs.js b/x-pack/plugins/reporting/server/routes/jobs.js
@@ -124,6 +124,16 @@ export function jobs(server) {
       const { docId } = request.params;
 
       let response = await jobResponseHandler(request.pre.management.jobTypes, request.pre.user, h, { docId });
+      const { statusCode } = response;
+
+      if (statusCode !== 200) {
+        const logLevel = statusCode === 500 ? 'error' : 'debug';
+        server.log(
+          [logLevel, "reporting", "download"],
+          `Report ${docId} has non-OK status: [${statusCode}] Reason: [${JSON.stringify(response.source)}]`
+        );
+      }
+
       if (!response.isBoom) {
         response = response.header('accept-ranges', 'none');
       }

diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
@@ -13,9 +13,5 @@ require('@kbn/test').runTestsCli([
   require.resolve('../test/functional/config.js'),
   require.resolve('../test/api_integration/config.js'),
   require.resolve('../test/saml_api_integration/config.js'),
-  require.resolve('../test/spaces_api_integration/spaces_only/config'),
-  require.resolve('../test/spaces_api_integration/security_and_spaces/config'),
-  require.resolve('../test/saved_object_api_integration/security_and_spaces/config'),
-  require.resolve('../test/saved_object_api_integration/security_only/config'),
-  require.resolve('../test/saved_object_api_integration/spaces_only/config'),
+  require.resolve('../test/rbac_api_integration/config.js'),
 ]);
diff --git a/x-pack/test/reporting/configs/api.js b/x-pack/test/reporting/configs/api.js
@@ -30,6 +30,7 @@ export async function getReportingApiConfig({ readConfigFile }) {
       serverArgs: [
         ...apiConfig.get('kbnTestServer.serverArgs'),
         `--optimize.enabled=true`,
+        '--logging.events.log', JSON.stringify(['info', 'warning', 'error', 'fatal', 'optimize', 'reporting'])
       ],
     },
   };

diff --git a/x-pack/test/reporting/configs/chromium_api.js b/x-pack/test/reporting/configs/chromium_api.js
@@ -22,7 +22,6 @@ export default async function ({ readConfigFile }) {
         ...reportingApiConfig.kbnTestServer.serverArgs,
         `--xpack.reporting.capture.browser.type=chromium`,
         `--xpack.spaces.enabled=false`,
-        `--logging.verbose=true`,
       ],
     },
   };

diff --git a/x-pack/test/reporting/configs/functional.js b/x-pack/test/reporting/configs/functional.js
@@ -21,9 +21,15 @@ export async function getFunctionalConfig({ readConfigFile }) {
     junit: {
       reportName: 'X-Pack Reporting Functional Tests',
     },
-    kbnTestServer: xPackFunctionalTestsConfig.get('kbnTestServer'),
+    kbnTestServer: {
+      ...xPackFunctionalTestsConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...xPackFunctionalTestsConfig.get('kbnTestServer.serverArgs'),
+        '--logging.events.log', JSON.stringify(['info', 'warning', 'error', 'fatal', 'optimize', 'reporting'])
+      ],
+    },
     testFiles: [require.resolve('../functional')],
   };
 }
 
-export default getFunctionalConfig;
+export default getFunctionalConfig;
diff --git a/x-pack/test/reporting/configs/phantom_functional.js b/x-pack/test/reporting/configs/phantom_functional.js
@@ -21,7 +21,6 @@ export default async function ({ readConfigFile }) {
       serverArgs: [
         ...functionalConfig.kbnTestServer.serverArgs,
         `--xpack.reporting.capture.browser.type=phantom`,
-        `--logging.verbose=true`,
       ],
     },
   };