Skip to content

Commit 93d1be6

Browse files
committed
add make baseline script
1 parent 5e41e5a commit 93d1be6

File tree

3 files changed

+44
-14
lines changed

3 files changed

+44
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"test": "npm run test-jasmine && npm test-image",
5454
"start-test_dashboard": "node devtools/test_dashboard/server.js",
5555
"start-image_viewer": "node devtools/image_viewer/server.js",
56-
"make-baseline": "./tasks/make_baseline.sh"
56+
"baseline": "./tasks/baseline.sh"
5757
},
5858
"dependencies": {
5959
"3d-view": "^2.0.0",

tasks/baseline.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#! /bin/bash
2+
#
3+
# TODO adapt this for Windows
4+
#
5+
# TODO add package.json config arguments to configure:
6+
# - container name,
7+
# - ports and
8+
# - imageserver version
9+
#
10+
# ===============================================================================
11+
12+
CONTAINER_NAME="imagetest"
13+
IMAGE_NAME="registry.plot.ly:5000/imageserver"
14+
IMAGE_VERSION="1.3.0"
15+
16+
# Run docker container:
17+
#
18+
# docker run -d --name $CONTAINER_NAME \
19+
# -v $PWD/plotly.js:/var/www/streambed/image_server/plotly.js \
20+
# -p 9010:9010 -p 2022:22 \
21+
# $IMAGE_NAME:[$IMAGE_VERSION]
22+
23+
CMD=(
24+
"cd /var/www/streambed/image_server/plotly.js &&"
25+
"cp -f test/image/index.html ../server_app/index.html &&"
26+
"monit restart nw1 &&"
27+
"sleep 5 &&"
28+
"node test/image/make_baseline.js $1"
29+
)
30+
31+
docker exec -i $CONTAINER_NAME /bin/bash -c "${CMD[*]}"

tasks/build-baseline-images.js renamed to test/image/make_baseline.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
1-
'use strict';
2-
3-
var request = require('request');
4-
var getOptions = require('./get-options');
51
var fs = require('fs');
62
var path = require('path');
7-
var ProgressBar = require('progress');
8-
var bar;
93

10-
var root = __dirname;
4+
var constants = require('../../tasks/util/constants');
5+
var getOptions = require('../../tasks/util/get_image_request_options');
6+
7+
// packages inside the image server docker
8+
var ProgressBar = require('progress');
9+
var request = require('request');
1110

1211
var userFileName = process.argv[2];
12+
var bar;
1313

1414

1515
if (!userFileName) {
16-
fs.readdir(root + '/../mocks', function (err, files) {
16+
fs.readdir(constants.pathToTestImageMocks, function (err, files) {
1717
console.log('####### ' + files.length + ' total baseline images to build #######');
1818
bar = new ProgressBar('processing [:bar] [:current / :total]', { total: files.length, width: 30 });
1919
if (err) return console.log(err);
2020
files.forEach(createBaselineImage);
2121
});
22-
} else {
22+
}
23+
else {
2324
createBaselineImage(userFileName);
2425
}
2526

2627

27-
28-
2928
function createBaselineImage (fileName) {
3029
if (path.extname(fileName) !== '.json') return;
3130

32-
var figure = require('../mocks/' + fileName);
31+
var figure = require(path.join(constants.pathToTestImageMocks, fileName));
3332
var bodyMock = {
3433
figure: figure,
3534
format: 'png',
3635
scale: 1
3736
};
3837

3938
var imageFileName = fileName.split('.')[0] + '.png';
40-
var savedImagePath = root + '/../test-images-baseline/' + imageFileName;
39+
var savedImagePath = path.join(constants.pathToTestImageBaselines, imageFileName);
4140
var savedImageStream = fs.createWriteStream(savedImagePath);
4241
var options = getOptions(bodyMock, 'http://localhost:9010/');
4342

0 commit comments

Comments
 (0)