Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Commit

Permalink
Merge 578faa5 into 09f32a7
Browse files Browse the repository at this point in the history
  • Loading branch information
greenkeeper[bot] committed May 7, 2019
2 parents 09f32a7 + 578faa5 commit dbfb60c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 12 deletions.
19 changes: 11 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
node_js:
- "8"
- "10"
- "12"
addons:
apt:
sources:
Expand All @@ -13,14 +13,17 @@ env:
- CXX=clang++-5.0
- CC=clang-5.0
install:
- |
printf "while [ true ]; do\nsleep 30\necho 'Building OpenCV'\ndone" > ping.sh
bash ping.sh &
echo $! > ping.pid
npm i opencv4nodejs > /dev/null 2>&1
kill `cat ping.pid`
# on node 12 opencv4nodejs and mjpeg-consumer cannot be installed
- if [[ `node --version` != v12* ]]; then
printf "while [ true ]; do\nsleep 30\necho 'Building OpenCV'\ndone" > ping.sh;
bash ping.sh &
echo $! > ping.pid;
npm i opencv4nodejs > /dev/null 2>&1;
kill `cat ping.pid`;

npm install --no-save mjpeg-consumer;
fi
- npm install
- npm install --no-save mjpeg-consumer
script:
- npm run test && npm run e2e-test
after_success:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
],
"devDependencies": {
"ajv": "^6.5.3",
"appium-gulp-plugins": "^3.1.0",
"appium-gulp-plugins": "^4.0.0",
"asyncbox": "^2.3.1",
"chai": "^4.1.2",
"chai-as-promised": "^7.1.1",
Expand Down
7 changes: 7 additions & 0 deletions test/image-util-e2e-specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ async function getImage (name) {
}

describe('image-util', function () {
before(function () {
// TODO: remove when opencv4nodejs can handle v12
if (process.version.startsWith('v12')) {
return this.skip();
}
});

describe('cropBase64Image', function () {
let originalImage = null;

Expand Down
14 changes: 11 additions & 3 deletions test/mjpeg-e2e-specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,24 @@ const MJPEG_SERVER_PORT = 8589;
const MJPEG_SERVER_URL = `http://localhost:${MJPEG_SERVER_PORT}`;

describe('MJpeg Stream (e2e)', function () {

let mJpegServer, stream;

before(function () {
// TODO: remove when buffertools can handle v12
if (process.version.startsWith('v12')) {
return this.skip();
}

mJpegServer = initMJpegServer(MJPEG_SERVER_PORT);
});

after(function () {
mJpegServer.close();
stream.stop(); // ensure streams are always stopped
if (mJpegServer) {
mJpegServer.close();
}
if (stream) {
stream.stop(); // ensure streams are always stopped
}
});

it('should update mjpeg stream based on new data from mjpeg server', async function () {
Expand Down

0 comments on commit dbfb60c

Please sign in to comment.