Skip to content
Permalink
Browse files

remove parallel-test (#922)

  • Loading branch information...
nsinkov authored and shamsimam committed Aug 15, 2019
1 parent 43cbff5 commit 7eafae2e7d5ea2624c2d665c88e643498a09497a
@@ -45,12 +45,12 @@ matrix:
- name: 'Waiter integration tests: composite-fast'
services: docker
before_script: cd waiter
script: ./bin/ci/run-integration-tests.sh composite parallel-test integration-fast
script: ./bin/ci/run-integration-tests.sh composite eftest integration-fast

- name: 'Waiter integration tests: composite-slow'
services: docker
before_script: cd waiter
script: ./bin/ci/run-integration-tests.sh composite parallel-test integration-slow
script: ./bin/ci/run-integration-tests.sh composite eftest integration-slow

- name: 'Waiter integration tests: kubernetes-heavy'
services: docker
@@ -60,17 +60,17 @@ matrix:
- name: 'Waiter integration tests: kubernetes-lite'
services: docker
before_script: cd waiter
script: ./bin/ci/run-integration-tests.sh k8s parallel-test integration-lite
script: ./bin/ci/run-integration-tests.sh k8s eftest integration-lite

- name: 'Waiter integration tests: marathon-fast'
services: docker
before_script: cd waiter
script: ./bin/ci/run-integration-tests.sh marathon parallel-test integration-fast
script: ./bin/ci/run-integration-tests.sh marathon eftest integration-fast

- name: 'Waiter integration tests: marathon-slow'
services: docker
before_script: cd waiter
script: ./bin/ci/run-integration-tests.sh marathon parallel-test integration-slow
script: ./bin/ci/run-integration-tests.sh marathon eftest integration-slow

- name: 'Waiter CLI integration tests'
services: docker
@@ -2,15 +2,15 @@
# Usage: run-integration-tests.sh [TEST_COMMAND] [TEST_SELECTOR]
#
# Examples:
# run-integration-tests.sh parallel-test integration
# run-integration-tests.sh parallel-test
# run-integration-tests.sh eftest integration
# run-integration-tests.sh eftest
# run-integration-tests.sh
#
# Runs the Token-Syncer integration tests after launching Waiter instances, and dumps log files if the tests fail.

set -ev

TEST_COMMAND=${1:-parallel-test}
TEST_COMMAND=${1:-eftest}
TEST_SELECTOR=${2:-integration}

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -2,16 +2,16 @@
# Usage: run-integration-tests-composite-scheduler.sh [TEST_COMMAND] [TEST_SELECTOR]
#
# Examples:
# run-integration-tests-composite-scheduler.sh parallel-test integration-fast
# run-integration-tests-composite-scheduler.sh parallel-test integration-slow
# run-integration-tests-composite-scheduler.sh parallel-test
# run-integration-tests-composite-scheduler.sh eftest integration-fast
# run-integration-tests-composite-scheduler.sh eftest integration-slow
# run-integration-tests-composite-scheduler.sh eftest
# run-integration-tests-composite-scheduler.sh
#
# Runs the Waiter integration tests using the (local) composite scheduler.

set -e

TEST_COMMAND=${1:-parallel-test}
TEST_COMMAND=${1:-eftest}
TEST_SELECTOR=${2:-integration}

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -2,16 +2,16 @@
# Usage: run-integration-tests-k8s-scheduler.sh [TEST_COMMAND] [TEST_SELECTOR]
#
# Examples:
# run-integration-tests-k8s-scheduler.sh parallel-test integration-heavy
# run-integration-tests-k8s-scheduler.sh parallel-test integration-lite
# run-integration-tests-k8s-scheduler.sh parallel-test
# run-integration-tests-k8s-scheduler.sh eftest integration-heavy
# run-integration-tests-k8s-scheduler.sh eftest integration-lite
# run-integration-tests-k8s-scheduler.sh eftest
# run-integration-tests-k8s-scheduler.sh
#
# Runs the Waiter integration tests using the (local) k8s scheduler.

set -e

TEST_COMMAND=${1:-parallel-test}
TEST_COMMAND=${1:-eftest}
TEST_SELECTOR=${2:-integration}

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -2,17 +2,17 @@
# Usage: run-integration-tests.sh [TEST_COMMAND] [TEST_SELECTOR]
#
# Examples:
# run-integration-tests.sh parallel-test integration-fast
# run-integration-tests.sh parallel-test integration-slow
# run-integration-tests.sh parallel-test
# run-integration-tests.sh eftest integration-fast
# run-integration-tests.sh eftest integration-slow
# run-integration-tests.sh eftest
# run-integration-tests.sh
#
# Runs the Waiter integration tests.

set -e

: ${WAITER_PORT:=9091}
TEST_COMMAND=${1:-parallel-test}
TEST_COMMAND=${1:-eftest}
TEST_SELECTOR=${2:-integration}

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -2,9 +2,9 @@
# Usage: run-integration-tests.sh [SCHEDULER_NAME] [TEST_COMMAND] [TEST_SELECTOR]
#
# Examples:
# run-integration-tests.sh shell parallel-test integration-fast
# run-integration-tests.sh shell parallel-test integration-slow
# run-integration-tests.sh shell parallel-test
# run-integration-tests.sh shell eftest integration-fast
# run-integration-tests.sh shell eftest integration-slow
# run-integration-tests.sh shell eftest
# run-integration-tests.sh shell
# run-integration-tests.sh
#
@@ -13,7 +13,7 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
WAITER_DIR=${DIR}/../..
SCHEDULER="${1:-shell}-scheduler"
SUBCMD="${DIR}/run-integration-tests-${SCHEDULER}.sh ${2:-parallel-test} ${3:-integration}"
SUBCMD="${DIR}/run-integration-tests-${SCHEDULER}.sh ${2:-eftest} ${3:-integration}"

# Start netcat to listen to a port. The Codahale Graphite reporter will be able to report without failing and spamming logs.
export GRAPHITE_SERVER_PORT=5555
@@ -2,9 +2,9 @@
# Usage: test.sh [TEST_COMMAND] [TEST_SELECTOR]
#
# Examples:
# test.sh parallel-test integration-fast
# test.sh parallel-test integration-slow
# test.sh parallel-test
# test.sh eftest integration-fast
# test.sh eftest integration-slow
# test.sh eftest
# test.sh
#
# Waits for waiter to be listening and then runs the given test selector. Checks if WAITER_URI and
@@ -23,7 +23,7 @@ function wait_for_waiter {
}
export -f wait_for_waiter

TEST_COMMAND=${1:-parallel-test}
TEST_COMMAND=${1:-eftest}
TEST_SELECTOR=${2:-integration}

if [ -z ${WAITER_URI+x} ]; then
@@ -449,7 +449,7 @@
;{:1006 11}
;expected: 12
;actual: 11
;lein parallel-test :only waiter.websocket-integration-test/test-request-parallel-streaming
;lein test :only waiter.websocket-integration-test/test-request-parallel-streaming
;FAIL in (test-request-parallel-streaming) (websocket_integration_test.clj:477)
;test-request-parallel-streaming
;Only in a: {:waiting-to-stream 0}
@@ -111,13 +111,14 @@
[slingshot "0.12.2"]
[try-let "1.3.1"
:exclusions [org.clojure/clojure]]]
:eftest {:report clojure.test/report}
:eftest {:report clojure.test/report
:thread-count (or (some-> (System/getenv "LEIN_TEST_THREADS") Integer/parseInt)
(.availableProcessors (Runtime/getRuntime)))}
:resource-paths ["resources"]
:main waiter.main
:plugins [[com.holychao/parallel-test "0.3.2"]
:plugins [[lein-eftest "0.5.8"]
[lein-exec "0.3.7"]
[test2junit "1.2.2"]
[lein-eftest "0.5.8"]]
[test2junit "1.2.2"]]
; In case of kerberos problems, export KRB5_KTNAME=/var/spool/keytabs/$(id -un)
:jvm-opts ["-server"
"-Dsun.security.jgss.lib=/opt/mitkrb5/lib/libgssapi_krb5.so"
@@ -153,11 +154,7 @@
(.getCanonicalPath (clojure.java.io/file "../containers/test-apps/nginx/bin/run-nginx-server.sh"))))
~(str "-Dwaiter.test.sediment.cmd="
(or (System/getenv "WAITER_TEST_SEDIMENT_CMD")
(.getCanonicalPath (clojure.java.io/file "../containers/test-apps/sediment/bin/run-sediment-server.sh"))))]
:parallel-test {:pools {:serial (constantly 1)
:parallel (fn []
(or (some-> (System/getenv "LEIN_TEST_THREADS") Long/valueOf)
(.availableProcessors (Runtime/getRuntime))))}}}
(.getCanonicalPath (clojure.java.io/file "../containers/test-apps/sediment/bin/run-sediment-server.sh"))))]}
:test-console {:jvm-opts
["-Dlog4j.configuration=log4j-console.properties"]}
:test-log {:jvm-opts

0 comments on commit 7eafae2

Please sign in to comment.
You can’t perform that action at this time.