Skip to content

Commit

Permalink
Update Travis config to new synapse setup
Browse files Browse the repository at this point in the history
  • Loading branch information
ulope committed Jan 14, 2019
1 parent 1bb9bba commit 7f73635
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 21 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
if: (type = cron OR NOT commit_message =~ /\[ci / OR commit_message =~ /\[ci integration-general\]/)
env:
- TEST='raiden/tests/integration --ignore=raiden/tests/integration/transfer --ignore=raiden/tests/integration/long_running --ignore=raiden/tests/integration/api --ignore=raiden/tests/integration/contracts --ignore=raiden/tests/integration/cli'
- TRANSPORT_OPTIONS='--transport=matrix --local-matrix=${HOME}/.bin/run_synapse.sh'
- TRANSPORT_OPTIONS='--transport=matrix'
- RUN_SYNAPSE=1

- stage: integration
Expand All @@ -117,7 +117,7 @@ jobs:
if: (type = cron OR NOT commit_message =~ /\[ci / OR commit_message =~ /\[ci integration-transfer\]/)
env:
- TEST='raiden/tests/integration/transfer'
- TRANSPORT_OPTIONS='--transport=matrix --local-matrix=${HOME}/.bin/run_synapse.sh'
- TRANSPORT_OPTIONS='--transport=matrix'
- RUN_SYNAPSE=1

- stage: integration
Expand All @@ -133,7 +133,7 @@ jobs:
if: (type = cron OR NOT commit_message =~ /\[ci / OR commit_message =~ /\[ci integration-long-running\]/)
env:
- TEST='raiden/tests/integration/long_running'
- TRANSPORT_OPTIONS='--transport=matrix --local-matrix=${HOME}/.bin/run_synapse.sh'
- TRANSPORT_OPTIONS='--transport=matrix'
- RUN_SYNAPSE=1
- RUN_COVERAGE=no_coverage

Expand All @@ -155,15 +155,15 @@ jobs:
if: (type = cron OR NOT commit_message =~ /\[ci / OR commit_message =~ /\[ci integration-api\]/)
env:
- TEST='raiden/tests/integration/api'
- TRANSPORT_OPTIONS='--transport=matrix --local-matrix=${HOME}/.bin/run_synapse.sh'
- TRANSPORT_OPTIONS='--transport=matrix'
- RUN_SYNAPSE=1

- stage: integration
<<: *job-template-integration
if: (type = cron OR NOT commit_message =~ /\[ci / OR commit_message =~ /\[ci integration-cli\]/)
env:
- TEST='raiden/tests/integration/cli'
- TRANSPORT_OPTIONS='--transport=matrix --local-matrix=${HOME}/.bin/run_synapse.sh'
- TRANSPORT_OPTIONS='--transport=matrix'
- RUN_SYNAPSE=1

- stage: deploy
Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
# pdbpp interferes with pyinstaller, uninstall it
- pip uninstall -y pdbpp
before_script:
- python setup.py build
- python setup.py build
script:
- source .travis/set_tag.sh
- mkdir -p dist/archive
Expand Down
4 changes: 0 additions & 4 deletions .travis/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@ set -x

.travis/download_solc.sh
.travis/download_geth.sh

if [ "$RUN_SYNAPSE" ]; then
tools/install_synapse.sh
fi
2 changes: 1 addition & 1 deletion .travis/run_smoketest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ set -x
if [[ -z ${RUN_SYNAPSE} ]]; then
raiden --transport=udp smoketest
else
raiden --transport=matrix smoketest --local-matrix="${HOME}/.bin/run_synapse.sh"
raiden --transport=matrix smoketest
fi
10 changes: 0 additions & 10 deletions raiden/tests/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,3 @@ Running integration tests with different transport protocols
Raiden can be run with two different underlying transport protocols, UDP and Matrix. Therefore tests that depend on the transport layer (all of them are integration tests) come in two versions.

The pytest option ``--transport=none|udp|matrix|all`` can be used to specify which versions of the test to run. By default, only the UDP versions of the tests are run, since the Matrix versions require the local installation of the `Synapse <https://matrix.org/docs/projects/server/synapse.html>`_ Matrix server.

Installing Synapse for Matrix tests
-----------------------------------

Synapse requires Python 2.7 and SQLite. Please run ``tools/install_synapse.sh`` to generate a standalone binary for it, or follow these steps:

- create a Python 2 virtualenv, install Synapse in it with pip, and
- create a script that runs Synapse as a python module, using the configuration file in ``raiden/tests/test_files``.

The script will then be called by the test suite during setup. The path can be specified with the ``--local-matrix`` option, it defaults to ``.synapse/run_synapse.sh`` in Raiden's main directory.

0 comments on commit 7f73635

Please sign in to comment.