Skip to content

Commit 928ad7a

Browse files
author
Mikhail Podtserkovskiy
committed
travis fix
1 parent 67bba29 commit 928ad7a

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-1
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ language: go
33
go:
44
- 1.8.x
55

6+
7+
before_install:
8+
- mysql -e 'CREATE DATABASE grid;'
69
install: make get-deps prepare
710
script:
811
- make test

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ concurrency-test-prepare: build
3636
go install github.com/qa-dev/jsonwire-grid/testing/webdriver-node-mock
3737
go install github.com/qa-dev/jsonwire-grid/testing/webdriver-mock-creator
3838
go install github.com/qa-dev/jsonwire-grid/testing/webdriver-concurrency-test
39-
CONFIG_PATH=$(TEST_CONFIG_PATH) nohup ${GOPATH}/bin/service-entrypoint >/dev/null 2>&1 &
39+
nohupkillall -9 service-entrypoint >/dev/null 2>&1 &
40+
CONFIG_PATH=$(TEST_CONFIG_PATH) ${GOPATH}/bin/service-entrypoint &
4041

4142
concurrency-test: concurrency-test-prepare
4243
webdriver-concurrency-test

config-test.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"logger": {
3+
"level": 3
4+
},
5+
"db": {
6+
"implementation": "mysql",
7+
"connection": "root:@(127.0.0.1:3306)/grid?tx_isolation=SERIALIZABLE&parseTime=true"
8+
},
9+
"grid": {
10+
"port": 4444,
11+
"strategy_list": [
12+
{
13+
"type": "default",
14+
"limit": 0
15+
}
16+
],
17+
"busy_node_duration": "15m",
18+
"reserved_node_duration": "5m"
19+
},
20+
"statsd": {
21+
"host": "statsd-host",
22+
"port": 8126,
23+
"protocol": "udp",
24+
"prefix": "products.tests.qa.debug-dev.jsonwire-grid.",
25+
"enable": false
26+
}
27+
}

0 commit comments

Comments
 (0)