VIDEO-3946 Stabilize network tests

.circleci/config.yml

@@ -140,7 +140,7 @@ commands:
     steps:
       - get-code # note: network tests run inside docker - the dependencies will be fetched inside docker image.
       - run:
-          name: Running Network Tests (environment = << pipeline.parameters.environment >>)
+          name: Running Network Tests (environment = prod)
           command: scripts/circleci-run-tests.sh
       - save-test-results
   framework-tests:
@@ -228,6 +228,7 @@ jobs:
       TEST_TYPE: "network"
       BVER: "stable"
       BROWSER: << parameters.browser >>
+      ENVIRONMENT: "prod"
       TOPOLOGY: << parameters.topology >>
       TEST_STABILITY: << parameters.test_stability >>
     executor: machine-executor

docker/dockerProxyClient.js

@@ -10,7 +10,7 @@ let requestNumber = 0;
 class DockerProxyClient {
   /**
    * Construct a new {@link DockerProxyClient}.
-   * @param {string} serverUrl - url pointing to an instance of {@link DockerProxyServer}
+   * @param {string} [serverUrl] - url pointing to an instance of {@link DockerProxyServer}
    */
   constructor(serverUrl) {
     this._serverUrl = serverUrl || DOCKER_PROXY_SERVER_URL;
@@ -155,12 +155,9 @@ class DockerProxyClient {
     const thisRequestNumber = requestNumber++;
     const logPrefix = `DockerProxyClient [${thisRequestNumber}]: `;
     try {
-      console.log(logPrefix + 'Requesting: ', api);
       const res = await fetch(this._serverUrl + api);
       const text = await res.text();
-      const json = text ? JSON.parse(text) : {};
-      console.log(logPrefix + 'Done: ', api, json);
-      return json;
+      return text ? JSON.parse(text) : {};
     } catch (err) {
       console.error(logPrefix + 'Threw  : ', err);
       throw err;

docker/dockerProxyServer.js

@@ -63,10 +63,8 @@ class DockerProxyServer {
       app.get(endpoint, async ({ params }, res, next) => {
         const thisRequestNumber = requestNumber++;
         const logPrefix = `DockerProxyServer [${thisRequestNumber}]: `;
-        console.log(logPrefix + 'Executing: ', endpoint, params);
         try {
           const data = await this[handleRequest](params);
-          console.log(logPrefix + 'Done executing: ', endpoint, params);
           return res.send(data);
         } catch (err) {
           console.error(logPrefix + 'Error executing: ', endpoint, params);
@@ -76,10 +74,7 @@ class DockerProxyServer {
     });
 
     return new Promise((resolve, reject) => {
-      this._server = app.listen(this._serverPort, () => {
-        console.log(`DockerProxyServer listening on port ${this._serverPort}!`);
-        resolve();
-      });
+      this._server = app.listen(this._serverPort, resolve);
       this._server.once('error', reject);
     });
   }

docker/fetchRequest.js

@@ -6,7 +6,6 @@ let requestId = 200;
 function fetchRequest(options, postData) {
   const thisRequest = requestId++;
   const logPrefix = `fetchRequest[${thisRequest}]: `;
-  console.log(logPrefix + 'Processing ', postData);
   return new Promise((resolve, reject) => {
     let clientRequest = http.request(options, res => {
       const requestFailed = res.statusCode !== 200 && res.statusCode !== 201;
@@ -27,7 +26,6 @@ function fetchRequest(options, postData) {
           if (requestFailed) {
             console.warn(logPrefix + 'requestFailed2 returned:', res.statusCode, postData);
           }
-          console.log(logPrefix + 'resolving');
           resolve(parsedData);
         } catch (e) {
           console.error(logPrefix + 'rejecting:', e);