Skip to content

Commit f6ea149

Browse files
Juhyung Parkmajecty
Juhyung Park
authored and
majecty
committed
Split dynamic validator tests
If we reuse a built CodeChain binary in Travis, we can merge the tests again.
1 parent 7292d1e commit f6ea149

13 files changed

+68
-45
lines changed

‎.travis.yml‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
after_failure:
5252
- test $INT_TEST_FLAG && ./upload_logs.sh
5353
- os: linux
54-
name: dynamic-validator
54+
name: dynamic-validator-1
5555
before_install:
5656
- SKIP=`.travis/check-mergify-merge` && if [[ "$SKIP" = "skip" ]]; then exit 0; fi
5757
- SKIP=`.travis/check-change '^spec/|\.md$'` && if [[ "$SKIP" = "skip" ]]; then exit 0; fi
@@ -64,7 +64,24 @@ jobs:
6464
- cargo build --verbose
6565
script:
6666
- cd test && yarn || exit 1
67-
- yarn start-dyn-val
67+
- yarn start-dyn-val-1
68+
after_failure:
69+
- test $INT_TEST_FLAG && ./upload_logs.sh
70+
- os: linux
71+
name: dynamic-validator-2
72+
before_install:
73+
- SKIP=`.travis/check-mergify-merge` && if [[ "$SKIP" = "skip" ]]; then exit 0; fi
74+
- SKIP=`.travis/check-change '^spec/|\.md$'` && if [[ "$SKIP" = "skip" ]]; then exit 0; fi
75+
- SKIP=`.travis/check-change '^test/'` && if [[ "$SKIP" = "noskip" ]]; then RUN_UNIT_TEST=1; fi
76+
install:
77+
- nvm install 10
78+
- nvm use 10
79+
- npm install -g yarn
80+
before_script:
81+
- cargo build --verbose
82+
script:
83+
- cd test && yarn || exit 1
84+
- yarn start-dyn-val-2
6885
after_failure:
6986
- test $INT_TEST_FLAG && ./upload_logs.sh
7087
- os: linux

‎test/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"start": "yarn start-short && yarn start-long",
1414
"start-short": "cargo build && mocha -r ts-node/register --timeout 5000 src/e2e/*.test.ts",
1515
"start-long": "cargo build && mocha -r ts-node/register --timeout 10000 src/e2e.long/*.test.ts",
16-
"start-dyn-val": "cargo build && mocha -r ts-node/register --timeout 10000 src/e2e.dynval/*.test.ts",
16+
"start-dyn-val-1": "cargo build && mocha -r ts-node/register --timeout 10000 src/e2e.dynval/1/*.test.ts",
17+
"start-dyn-val-2": "cargo build && mocha -r ts-node/register --timeout 10000 src/e2e.dynval/2/*.test.ts",
1718
"start-release": "yarn start-short-release && yarn start-long-release",
1819
"start-short-release": "cargo build --release && NODE_ENV=production mocha -r ts-node/register --timeout 5000 src/e2e/*.test.ts",
1920
"start-long-release": "cargo build --release && NODE_ENV=production mocha -r ts-node/register --timeout 10000 src/e2e.long/*.test.ts",

test/src/e2e.dynval/doubleVote.test.ts renamed to test/src/e2e.dynval/1/doubleVote.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import * as chaiAsPromised from "chai-as-promised";
2020
import * as stake from "codechain-stakeholder-sdk";
2121
import "mocha";
2222

23-
import { Mock } from "../helper/mock";
24-
import { Step as TendermintStep } from "../helper/mock/tendermintMessage";
25-
import { validators } from "../../tendermint.dynval/constants";
26-
import { PromiseExpect } from "../helper/promise";
27-
import { setTermTestTimeout, withNodes } from "./setup";
23+
import { Mock } from "../../helper/mock";
24+
import { Step as TendermintStep } from "../../helper/mock/tendermintMessage";
25+
import { validators } from "../../../tendermint.dynval/constants";
26+
import { PromiseExpect } from "../../helper/promise";
27+
import { setTermTestTimeout, withNodes } from "../setup";
2828

2929
chai.use(chaiAsPromised);
3030

test/src/e2e.dynval/dv.changeParams.test.ts renamed to test/src/e2e.dynval/1/dv.changeParams.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import { SDK } from "codechain-sdk";
2121
import * as stake from "codechain-stakeholder-sdk";
2222
import "mocha";
2323

24-
import { validators } from "../../tendermint.dynval/constants";
25-
import { faucetAddress, faucetSecret } from "../helper/constants";
26-
import { PromiseExpect } from "../helper/promise";
27-
import { changeParams, setTermTestTimeout, withNodes } from "./setup";
24+
import { validators } from "../../../tendermint.dynval/constants";
25+
import { faucetAddress, faucetSecret } from "../../helper/constants";
26+
import { PromiseExpect } from "../../helper/promise";
27+
import { changeParams, setTermTestTimeout, withNodes } from "../setup";
2828

2929
chai.use(chaiAsPromised);
3030

test/src/e2e.dynval/dv.m-m'.test.ts renamed to test/src/e2e.dynval/1/dv.m-m'.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import { SDK } from "codechain-sdk";
2121
import * as stake from "codechain-stakeholder-sdk";
2222
import "mocha";
2323

24-
import { validators } from "../../tendermint.dynval/constants";
25-
import { faucetAddress, faucetSecret } from "../helper/constants";
26-
import { PromiseExpect } from "../helper/promise";
27-
import { setTermTestTimeout, withNodes } from "./setup";
24+
import { validators } from "../../../tendermint.dynval/constants";
25+
import { faucetAddress, faucetSecret } from "../../helper/constants";
26+
import { PromiseExpect } from "../../helper/promise";
27+
import { setTermTestTimeout, withNodes } from "../setup";
2828

2929
chai.use(chaiAsPromised);
3030

test/src/e2e.dynval/dv.n'.test.ts renamed to test/src/e2e.dynval/1/dv.n'.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import { SDK } from "codechain-sdk";
2121
import * as stake from "codechain-stakeholder-sdk";
2222
import "mocha";
2323

24-
import { validators } from "../../tendermint.dynval/constants";
25-
import { faucetAddress, faucetSecret } from "../helper/constants";
26-
import { PromiseExpect } from "../helper/promise";
27-
import { findNode, setTermTestTimeout, withNodes } from "./setup";
24+
import { validators } from "../../../tendermint.dynval/constants";
25+
import { faucetAddress, faucetSecret } from "../../helper/constants";
26+
import { PromiseExpect } from "../../helper/promise";
27+
import { findNode, setTermTestTimeout, withNodes } from "../setup";
2828

2929
chai.use(chaiAsPromised);
3030

test/src/e2e.dynval/dv.n-1.test.ts renamed to test/src/e2e.dynval/1/dv.n-1.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import { SDK } from "codechain-sdk";
2121
import * as stake from "codechain-stakeholder-sdk";
2222
import "mocha";
2323

24-
import { validators as originalValidators } from "../../tendermint.dynval/constants";
25-
import { faucetAddress, faucetSecret } from "../helper/constants";
26-
import { PromiseExpect } from "../helper/promise";
27-
import { setTermTestTimeout, withNodes } from "./setup";
24+
import { validators as originalValidators } from "../../../tendermint.dynval/constants";
25+
import { faucetAddress, faucetSecret } from "../../helper/constants";
26+
import { PromiseExpect } from "../../helper/promise";
27+
import { setTermTestTimeout, withNodes } from "../setup";
2828

2929
chai.use(chaiAsPromised);
3030

test/src/e2e.dynval/dv.n.test.ts renamed to test/src/e2e.dynval/1/dv.n.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import { SDK } from "codechain-sdk";
2121
import * as stake from "codechain-stakeholder-sdk";
2222
import "mocha";
2323

24-
import { validators } from "../../tendermint.dynval/constants";
25-
import { faucetAddress, faucetSecret } from "../helper/constants";
26-
import { PromiseExpect } from "../helper/promise";
27-
import { findNode, setTermTestTimeout, withNodes } from "./setup";
24+
import { validators } from "../../../tendermint.dynval/constants";
25+
import { faucetAddress, faucetSecret } from "../../helper/constants";
26+
import { PromiseExpect } from "../../helper/promise";
27+
import { findNode, setTermTestTimeout, withNodes } from "../setup";
2828

2929
chai.use(chaiAsPromised);
3030

test/src/e2e.dynval/dv.n+1.test.ts renamed to test/src/e2e.dynval/2/dv.n+1.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import { SDK } from "codechain-sdk";
2121
import * as stake from "codechain-stakeholder-sdk";
2222
import "mocha";
2323

24-
import { validators } from "../../tendermint.dynval/constants";
25-
import { faucetAddress, faucetSecret } from "../helper/constants";
26-
import { PromiseExpect } from "../helper/promise";
27-
import { findNode, setTermTestTimeout, withNodes } from "./setup";
24+
import { validators } from "../../../tendermint.dynval/constants";
25+
import { faucetAddress, faucetSecret } from "../../helper/constants";
26+
import { PromiseExpect } from "../../helper/promise";
27+
import { findNode, setTermTestTimeout, withNodes } from "../setup";
2828

2929
chai.use(chaiAsPromised);
3030

test/src/e2e.dynval/dv.nomination.test.ts renamed to test/src/e2e.dynval/2/dv.nomination.test.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,14 @@ import { H512 } from "codechain-primitives/lib";
2121
import * as stake from "codechain-stakeholder-sdk";
2222
import "mocha";
2323

24-
import { validators } from "../../tendermint.dynval/constants";
25-
import { PromiseExpect } from "../helper/promise";
26-
import { findNode, selfNominate, setTermTestTimeout, withNodes } from "./setup";
24+
import { validators } from "../../../tendermint.dynval/constants";
25+
import { PromiseExpect } from "../../helper/promise";
26+
import {
27+
findNode,
28+
selfNominate,
29+
setTermTestTimeout,
30+
withNodes
31+
} from "../setup";
2732

2833
chai.use(chaiAsPromised);
2934

0 commit comments

Comments
 (0)