Merge branch 'w/8.1/3284-test' of github.com:scality/cloudserver into w/8.1/3284-test

eve/main.yml

@@ -167,12 +167,7 @@ stages:
           stage_names:
             - docker-build
             - linting-coverage
-            - file-ft-tests
-            - multiple-backend-test
             - mongo-ft-tests
-            - ceph-backend-tests
-            - kmip-ft-tests
-            - utapi-v2-tests
           waitForFinish: true
           haltOnFailure: true
 

lib/Config.js

@@ -430,6 +430,9 @@ class Config extends EventEmitter {
         try {
             const data = fs.readFileSync(this.locationConfigPath,
                 { encoding: 'utf-8' });
+            console.log('[LOCATION]');
+            console.log(data);
+            console.log('[LOCATION]');
             locationConfig = JSON.parse(data);
         } catch (err) {
             throw new Error(`could not parse location config file:
@@ -479,6 +482,9 @@ class Config extends EventEmitter {
         try {
             const data = fs.readFileSync(this.configPath,
                 { encoding: 'utf-8' });
+            console.log('[CONFIG]');
+            console.log(data);
+            console.log('[CONFIG]');
             config = JSON.parse(data);
         } catch (err) {
             throw new Error(`could not parse config file: ${err.message}`);
@@ -831,8 +837,10 @@ class Config extends EventEmitter {
                 if (typeof config.localCache.sentinels === 'string') {
                     config.localCache.sentinels.split(',').forEach(item => {
                         const [host, port] = item.split(':');
-                        this.localCache.sentinels.push({ host,
+                        this.localCache.sentinels.push({
-                            port: Number.parseInt(port, 10) });
+                            host,
+                            port: Number.parseInt(port, 10)
+                        });
                     });
                 } else if (Array.isArray(config.localCache.sentinels)) {
                     config.localCache.sentinels.forEach(item => {
@@ -892,8 +900,10 @@ class Config extends EventEmitter {
                 if (typeof config.redis.sentinels === 'string') {
                     config.redis.sentinels.split(',').forEach(item => {
                         const [host, port] = item.split(':');
-                        this.redis.sentinels.push({ host,
+                        this.redis.sentinels.push({
-                            port: Number.parseInt(port, 10) });
+                            host,
+                            port: Number.parseInt(port, 10)
+                        });
                     });
                 } else if (Array.isArray(config.redis.sentinels)) {
                     config.redis.sentinels.forEach(item => {

package.json

@@ -30,11 +30,10 @@
     "commander": "^2.9.0",
     "cron-parser": "^2.11.0",
     "diskusage": "1.1.3",
-    "express": "^4.17.1",
     "google-auto-auth": "^0.9.1",
     "http-proxy": "^1.17.0",
-    "level-mem": "^5.0.1",
     "https-proxy-agent": "^2.2.0",
+    "level-mem": "^5.0.1",
     "moment": "^2.26.0",
     "mongodb": "^2.2.31",
     "node-forge": "^0.7.1",
@@ -42,7 +41,6 @@
     "npm-run-all": "~4.1.5",
     "prom-client": "^10.2.3",
     "request": "^2.81.0",
-    "sinon": "^9.0.2",
     "sql-where-parser": "~2.2.1",
     "utapi": "scality/utapi#357f8fe",
     "utf-8-validate": "^4.0.2",
@@ -59,6 +57,7 @@
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-config-scality": "scality/Guidelines#28e73a2",
     "eslint-plugin-import": "^2.14.0",
+    "express": "^4.17.1",
     "ioredis": "4.9.5",
     "istanbul": "1.0.0-alpha.2",
     "istanbul-api": "1.0.0-alpha.13",
@@ -67,6 +66,7 @@
     "mocha-junit-reporter": "^1.23.1",
     "mocha-multi-reporters": "^1.1.7",
     "node-mocks-http": "1.5.2",
+    "sinon": "^9.2.4",
     "tv4": "^1.2.7"
   },
   "scripts": {
@@ -85,7 +85,7 @@
     "ft_s3cmd": "cd tests/functional/s3cmd && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 *.js",
     "ft_s3curl": "cd tests/functional/s3curl && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 *.js",
     "ft_util": "cd tests/functional/utilities && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 *.js",
-    "ft_test": "npm-run-all -s ft_awssdk ft_s3cmd ft_s3curl ft_node ft_healthchecks ft_management ft_util",
+    "ft_test": "npm-run-all -s ft_awssdk",
     "ft_search": "cd tests/functional/aws-node-sdk && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 90000 test/mdSearch",
     "ft_kmip": "cd tests/functional/kmip && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 *.js",
     "install_ft_deps": "yarn install aws-sdk@2.28.0 bluebird@3.3.1 mocha@2.3.4 mocha-junit-reporter@1.23.1 tv4@1.2.7",

tests/functional/aws-node-sdk/test/mdSearch/versionEnabledSearch.js

@@ -6,7 +6,9 @@ const userMetadata = { food: 'pizza' };
 const updatedMetadata = { food: 'salad' };
 const masterKey = 'master';
 
-runIfMongo('Search in version enabled bucket', () => {
+console.log('process.env.CI_CEPH', process.env.CI_CEPH);
+
+describe('Search in version enabled bucket', () => {
     const bucketName = `versionedbucket${Date.now()}`;
     const VersioningConfiguration = {
         MFADelete: 'Disabled',