Consolidate contract tests; further simplify job names.

pull/562/head
Kieran Prasch 2018-12-05 18:15:51 -08:00
parent 8b5026afb8
commit 164d499884
No known key found for this signature in database
GPG Key ID: 199AB839D4125A62
3 changed files with 16 additions and 35 deletions

View File

@ -24,13 +24,6 @@ workflows:
requires: requires:
- pip_install - pip_install
- pipenv_install - pipenv_install
- intercontract_integration:
context: "NuCypher Tests"
filters:
tags:
only: /.*/
requires:
- contracts
- config: - config:
context: "NuCypher Tests" context: "NuCypher Tests"
filters: filters:
@ -62,7 +55,7 @@ workflows:
requires: requires:
- pip_install - pip_install
- pipenv_install - pipenv_install
- blockchain_interface: - blockchain:
context: "NuCypher Tests" context: "NuCypher Tests"
filters: filters:
tags: tags:
@ -85,31 +78,31 @@ workflows:
tags: tags:
only: /.*/ only: /.*/
requires: requires:
- intercontract_integration - blockchain
- blockchain_interface - contracts
- actors: - actors:
context: "NuCypher Tests" context: "NuCypher Tests"
filters: filters:
tags: tags:
only: /.*/ only: /.*/
requires: requires:
- intercontract_integration - blockchain
- blockchain_interface - contracts
- deployers: - deployers:
context: "NuCypher Tests" context: "NuCypher Tests"
filters: filters:
tags: tags:
only: /.*/ only: /.*/
requires: requires:
- intercontract_integration - blockchain
- blockchain_interface - contracts
- config: - config:
context: "NuCypher Tests" context: "NuCypher Tests"
filters: filters:
tags: tags:
only: /.*/ only: /.*/
requires: requires:
- blockchain_interface - blockchain
- crypto - crypto
- network - network
- keystore - keystore
@ -225,7 +218,7 @@ jobs:
name: Check Python Entrypoint name: Check Python Entrypoint
command: python3 -c "import nucypher; print(nucypher.__version__)" command: python3 -c "import nucypher; print(nucypher.__version__)"
blockchain_interface: blockchain:
<<: *python_36_base <<: *python_36_base
parallelism: 2 parallelism: 2
steps: steps:
@ -241,6 +234,7 @@ jobs:
agents: agents:
<<: *python_36_base <<: *python_36_base
parallelism: 2
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:
@ -254,6 +248,7 @@ jobs:
actors: actors:
<<: *python_36_base <<: *python_36_base
parallelism: 2
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:
@ -267,20 +262,21 @@ jobs:
deployers: deployers:
<<: *python_36_base <<: *python_36_base
parallelism: 4
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:
at: ~/.local/share/virtualenvs/ at: ~/.local/share/virtualenvs/
- run: - run:
name: Contract Deployer Tests name: Contract Deployer Tests
command: pipenv run pytest --cov=nucypher/blockchain/eth -v --runslow tests/blockchain/eth/entities/deployers --junitxml=./reports/pytest/results.xml command: pipenv run pytest --cov=nucypher/blockchain/eth -v --runslow --junitxml=./reports/pytest/results.xml $(circleci tests glob tests/blockchain/eth/entities/deployers/test_*.py | circleci tests split --split-by=timings)
- run: *coveralls - run: *coveralls
- store_test_results: - store_test_results:
path: ./reports/pytest/ path: ./reports/pytest/
contracts: contracts:
<<: *python_36_base <<: *python_36_base
parallelism: 4 parallelism: 5
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:
@ -378,19 +374,6 @@ jobs:
- store_test_results: - store_test_results:
path: ./reports/pytest/ path: ./reports/pytest/
intercontract_integration:
<<: *python_36_base
steps:
- checkout
- attach_workspace:
at: ~/.local/share/virtualenvs/
- run:
name: Ethereum Inter-Contract Integration Test
command: |
pipenv run pytest -v --runslow tests/blockchain/eth/contracts/main/test_intercontract_integration.py --junitxml=./reports/pytest/intercontract_integration_results.xml
- store_test_results:
path: ./reports/pytest/
cli: cli:
<<: *python_36_base <<: *python_36_base
parallelism: 4 parallelism: 4
@ -401,8 +384,7 @@ jobs:
- run: - run:
name: Nucypher CLI Tests name: Nucypher CLI Tests
command: | command: |
pipenv run pytest --cov=nucypher/cli.py -v --runslow $(circleci tests glob tests/cli/**/test_*.py | circleci tests split --split-by=timings) --junitxml=./reports/pytest/cli_results.xml pipenv run pytest -v --runslow $(circleci tests glob tests/cli/**/test_*.py | circleci tests split --split-by=timings) --junitxml=./reports/pytest/cli_results.xml
- run: *coveralls
- store_test_results: - store_test_results:
path: ./reports/pytest/ path: ./reports/pytest/
@ -415,8 +397,7 @@ jobs:
- run: - run:
name: Ursula Command Tests name: Ursula Command Tests
command: | command: |
pipenv run pytest -v --cov=nucypher/cli.py --runslow tests/cli/protocol --junitxml=./reports/pytest/results.xml pipenv run pytest -v --runslow tests/cli/protocol --junitxml=./reports/pytest/results.xml
- run: *coveralls
- store_test_results: - store_test_results:
path: ./reports/pytest/ path: ./reports/pytest/