diff --git a/.travis.yml b/.travis.yml index 6e0b4bb..853bfdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,5 +75,5 @@ script: - if [ -n "$LINT" ] ; then yarn run test:lint; fi - if [ -z "$BENCH$LINT" ] ; then yarn run test:base; fi # to permit benchmark with mariasql - - if [ -n "$BENCH" ] ; then npm install mariasql; fi + - if [ -n "$BENCH" ] ; then npm install microtime mariasql; fi - if [ -n "$BENCH" ] ; then yarn run benchmark; fi diff --git a/.travis/wait-for-docker-up.js b/.travis/wait-for-docker-up.js index b441669..601e83a 100644 --- a/.travis/wait-for-docker-up.js +++ b/.travis/wait-for-docker-up.js @@ -6,13 +6,13 @@ const Conf = require('../test/conf'); const connOptions = new ConnOptions(Conf.baseConfig); let decrement = 20; -var callback = () => console.log("connected to docker server"); +var callback = () => console.log("docker db server up"); const checkConnection = function() { decrement-=1; let conn = new Connection(connOptions); conn.on('error', (err) => { - console.error("Error connecting docker server (connection:" + decrement + ")"); + console.error("Error connecting docker server (connection try " + (20 - decrement) + " of 20)"); if (decrement === 0) { throw err; } else { diff --git a/appveyor.yml b/appveyor.yml index 18e6c83..f66ffe0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,17 +6,24 @@ environment: CMAKE_PARAM: 'Visual Studio 15 2017 Win64' MUST_USE_TCPIP: 1 matrix: - - DB: '10.2.12' + - DB: '10.2.13' nodejs_version: "6" - - DB: '10.2.12' + - DB: '10.2.13' nodejs_version: "8" - - DB: '10.2.12' + - DB: '10.2.13' nodejs_version: "9" MYSQL_USE_COMPRESSION: 1 - - DB: '10.2.12' + - DB: '10.2.13' + nodejs_version: "9" + + - DB: '10.2.13' + nodejs_version: "9" + BENCH: "1" + + - DB: '10.2.13' nodejs_version: "8" - DB: '10.3.4' @@ -50,4 +57,5 @@ test_script: - node --version - yarn --version - cd c:\projects\mariadb-connector-nodejs - - npm test + - if "%BENCH%" == "1" ( npm install microtime mariasql ) else ( npm test ) + - if "%BENCH%" == "1" ( yarn run benchmark ) diff --git a/test/conf.js b/test/conf.js index 2294884..df237ae 100644 --- a/test/conf.js +++ b/test/conf.js @@ -5,7 +5,7 @@ if (process.env.TEST_HOST) baseConfig["host"] = process.env.TEST_HOST; if (process.env.TEST_USER) baseConfig["user"] = process.env.TEST_USER; if (process.env.TEST_PASSWORD) baseConfig["password"] = process.env.TEST_PASSWORD; if (process.env.TEST_DB) baseConfig["database"] = process.env.TEST_DB; -if (process.env.TEST_PORT) baseConfig["port"] = process.env.TEST_PORT; +if (process.env.TEST_PORT) baseConfig["port"] = parseInt(process.env.TEST_PORT, 10); global.longTest = process.env.TEST_LONG ? process.env.TEST_LONG : false; module.exports.baseConfig = baseConfig;