From 028d23b8db52a976499729240c819996b08ddd4b Mon Sep 17 00:00:00 2001 From: rht Date: Mon, 18 Sep 2017 08:28:17 +0200 Subject: [PATCH 1/3] Add test-backend from Zulip server. --- .travis.yml | 15 ++++++++++++++- tools/test-backend | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 tools/test-backend diff --git a/.travis.yml b/.travis.yml index 9c4997fa7..0a2e86763 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,26 @@ python: - "3.4" - "3.5" - "3.6" -env: TEST_SUITE=test-main +env: + matrix: + - TEST_SUITE=test-main + global: + - BOTO_CONFIG=/tmp/nowhere matrix: include: - python: "2.7" env: TEST_SUITE=test-py2-legacy-support - python: "3.6" env: TEST_SUITE=test-static-analysis + - python: "3.6" + sudo: required + env: TEST_SUITE=backend + script: + - echo "$TRAVIS_PULL_REQUEST" + - cd + - git clone https://github.com/zulip/zulip.git + - cd zulip + - $TRAVIS_BUILD_DIR/tools/test-backend addons: postgresql: "9.3" install: diff --git a/tools/test-backend b/tools/test-backend new file mode 100755 index 000000000..3bcb039f3 --- /dev/null +++ b/tools/test-backend @@ -0,0 +1,15 @@ +#!/bin/bash + +sed -i "s|python-zulip-api.git@0.3.4|python-zulip-api.git@refs/pull/$TRAVIS_PULL_REQUEST|" requirements/common.txt +sed -i "s|python-zulip-api.git@0.3.4|python-zulip-api.git@refs/pull/$TRAVIS_PULL_REQUEST|" requirements/dev_lock.txt +sed -i "s|python-zulip-api.git@0.3.4|python-zulip-api.git@refs/pull/$TRAVIS_PULL_REQUEST|" requirements/prod_lock.txt + +./tools/travis/setup-backend + +source tools/travis/activate-venv +echo "Test suite is running under $(python --version)." + +set -e +set -x + +./tools/test-api From 058eb983b2e13907a0d97c7727b4ac6c3d5582f0 Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 5 Oct 2017 07:19:40 +0200 Subject: [PATCH 2/3] a --- .travis.yml | 1 - tools/test-backend | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a2e86763..d8cfd34e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ matrix: sudo: required env: TEST_SUITE=backend script: - - echo "$TRAVIS_PULL_REQUEST" - cd - git clone https://github.com/zulip/zulip.git - cd zulip diff --git a/tools/test-backend b/tools/test-backend index 3bcb039f3..9a717077d 100755 --- a/tools/test-backend +++ b/tools/test-backend @@ -1,8 +1,8 @@ #!/bin/bash -sed -i "s|python-zulip-api.git@0.3.4|python-zulip-api.git@refs/pull/$TRAVIS_PULL_REQUEST|" requirements/common.txt -sed -i "s|python-zulip-api.git@0.3.4|python-zulip-api.git@refs/pull/$TRAVIS_PULL_REQUEST|" requirements/dev_lock.txt -sed -i "s|python-zulip-api.git@0.3.4|python-zulip-api.git@refs/pull/$TRAVIS_PULL_REQUEST|" requirements/prod_lock.txt +sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG.git@$TRAVIS_PULL_REQUEST_BRANCH|" requirements/common.txt +sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG.git@$TRAVIS_PULL_REQUEST_BRANCH|" requirements/dev_lock.txt +sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG.git@$TRAVIS_PULL_REQUEST_BRANCH|" requirements/prod_lock.txt ./tools/travis/setup-backend From ef0ab8a70b4e07464cc7243544820a887ea93140 Mon Sep 17 00:00:00 2001 From: rht Date: Thu, 5 Oct 2017 10:43:39 +0200 Subject: [PATCH 3/3] b --- .travis.yml | 3 +++ tools/test-backend | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8cfd34e5..6403cc585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,9 @@ matrix: sudo: required env: TEST_SUITE=backend script: + - echo $TRAVIS_PULL_REQUEST_BRANCH + - echo $TRAVIS_PULL_REQUEST_SLUG + - echo $TRAVIS_PULL_REQUEST - cd - git clone https://github.com/zulip/zulip.git - cd zulip diff --git a/tools/test-backend b/tools/test-backend index 9a717077d..4ee7999ef 100755 --- a/tools/test-backend +++ b/tools/test-backend @@ -1,8 +1,8 @@ #!/bin/bash -sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG.git@$TRAVIS_PULL_REQUEST_BRANCH|" requirements/common.txt -sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG.git@$TRAVIS_PULL_REQUEST_BRANCH|" requirements/dev_lock.txt -sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG.git@$TRAVIS_PULL_REQUEST_BRANCH|" requirements/prod_lock.txt +sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG/tree/$TRAVIS_PULL_REQUEST_BRANCH|" requirements/common.txt +sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG/tree/$TRAVIS_PULL_REQUEST_BRANCH|" requirements/dev_lock.txt +sed -i "s|zulip/python-zulip-api.git@0.3.4|$TRAVIS_PULL_REQUEST_SLUG/tree/$TRAVIS_PULL_REQUEST_BRANCH|" requirements/prod_lock.txt ./tools/travis/setup-backend