Permalink
Browse files

split 04 test suite in two

Fixes #1086
  • Loading branch information...
starpit committed Aug 2, 2018
1 parent a385909 commit 29d08da71bf0c7b0b6297ae4a1e07b95dafb5e88
Showing with 83 additions and 9 deletions.
  1. +5 −3 .travis.yml
  2. 0 tests/tests/passes/{04 → 04a}/apis.js
  3. 0 tests/tests/passes/{04 → 04a}/append-to-sequence.js
  4. 0 tests/tests/passes/{04 → 04a}/at-file-params.js
  5. 0 tests/tests/passes/{04 → 04a}/auth-from-slash-auth.js
  6. 0 tests/tests/passes/{04 → 04a}/auth.js
  7. 0 tests/tests/passes/{04 → 04a}/await.js
  8. 0 tests/tests/passes/{04 → 04a}/click-on-action-part-of-activation.js
  9. 0 tests/tests/passes/{04 → 04a}/click-on-context.js
  10. 0 tests/tests/passes/{04 → 04a}/click-on-selection.js
  11. 0 tests/tests/passes/{04 → 04a}/debugger.js
  12. 0 tests/tests/passes/{04 → 04a}/edit-new.js
  13. 0 tests/tests/passes/{04 → 04a}/edit.js
  14. 0 tests/tests/passes/{04 → 04a}/every.js
  15. 0 tests/tests/passes/{04 → 04a}/fancy-context.js
  16. 0 tests/tests/passes/{04 → 04a}/history.js
  17. 0 tests/tests/passes/{04 → 04a}/jar.js
  18. 0 tests/tests/passes/{04 → 04a}/let-anonymous.js
  19. 0 tests/tests/passes/{04 → 04a}/let-base64.js
  20. 0 tests/tests/passes/{04 → 04a}/let-remote.js
  21. 0 tests/tests/passes/{04 → 04b}/let-webjs.js
  22. 0 tests/tests/passes/{04 → 04b}/let-with-dots.js
  23. 0 tests/tests/passes/{04 → 04b}/let-with-spaces.js
  24. 0 tests/tests/passes/{04 → 04b}/let.js
  25. 0 tests/tests/passes/{04 → 04b}/limits-via-let.js
  26. 0 tests/tests/passes/{04 → 04b}/limits.js
  27. 0 tests/tests/passes/{04 → 04b}/local.js
  28. 0 tests/tests/passes/{04 → 04b}/on.js
  29. 0 tests/tests/passes/{04 → 04b}/pagination.js
  30. 0 tests/tests/passes/{04 → 04b}/paste.js
  31. 0 tests/tests/passes/{04 → 04b}/rm-with-wildcards.js
  32. 0 tests/tests/passes/{04 → 04b}/rm.js
  33. 0 tests/tests/passes/{04 → 04b}/roots-with-error.js
  34. 0 tests/tests/passes/{04 → 04b}/roots.js
  35. 0 tests/tests/passes/{04 → 04b}/run.js
  36. 0 tests/tests/passes/{04 → 04b}/seq-let.js
  37. 0 tests/tests/passes/{04 → 04b}/webbify.js
  38. 0 tests/tests/passes/{04 → 04b}/z-activation-list-drilldowns.js
  39. 0 tests/tests/passes/{04 → 04b}/zip.js
  40. +4 −1 tools/travis/build.sh
  41. +4 −2 tools/travis/init_auth.sh
  42. +69 −0 tools/travis/runtimes.json
  43. +1 −3 tools/travis/setup.sh
View
@@ -59,7 +59,7 @@ install:
# if for some reason we want to avoid the use of travis jobs:
#script: (cd tests && npm run test)
#script: (cd tests && ./bin/runLocal.sh 01 08 07 02 03 04 05)
#script: (cd tests && ./bin/runLocal.sh 01 08 07 02 03 04a 04b 05)
jobs:
include:
@@ -69,5 +69,7 @@ jobs:
env: EXECUTING=07
- script: (cd tests && ./bin/runLocal.sh 03)
env: EXECUTING=03
- script: (cd tests && ./bin/runLocal.sh 04)
env: EXECUTING=04
- script: (cd tests && ./bin/runLocal.sh 04a)
env: EXECUTING=04a
- script: (cd tests && ./bin/runLocal.sh 04b)
env: EXECUTING=04b
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -15,6 +15,9 @@ grep -vE 'controller1|invoker1' hosts.bak > hosts.j2.ini
# Install OpenWhisk
cd $WHISKDIR/ansible
# smash in our smaller set up required runtimes
cp "$SCRIPTDIR/runtimes.json" "$WHISKDIR/ansible/files"
# note that we increase the quotas on invocations per minute and concurrent invocations (per namespace)
ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=openwhisk -e limit_invocations_per_minute=600 -e limit_invocations_concurrent=100"
@@ -23,7 +26,7 @@ $ANSIBLE_CMD prereq.yml
#(cd $ROOTDIR/tests/docker && ./build.sh) & # initialize test docker base image, in parallel (!!! must be after prereq, as it restarts docker)
$ANSIBLE_CMD couchdb.yml
$ANSIBLE_CMD initdb.yml
$ANSIBLE_CMD apigateway.yml # not needed directly, but it comes with redis, which we need
$ANSIBLE_CMD apigateway.yml # not needed directly, but it comes with redis if we need it
cd $WHISKDIR
./gradlew -PdockerImagePrefix=openwhisk
@@ -25,7 +25,8 @@ cd $SCRIPTDIR
./wskadmin user delete user01 | grep -v "Failed to delete subject"
./wskadmin user delete user02 | grep -v "Failed to delete subject"
./wskadmin user delete user03 | grep -v "Failed to delete subject"
./wskadmin user delete user04 | grep -v "Failed to delete subject"
./wskadmin user delete user04a | grep -v "Failed to delete subject"
./wskadmin user delete user04ab | grep -v "Failed to delete subject"
./wskadmin user delete user04b | grep -v "Failed to delete subject"
./wskadmin user delete user05 | grep -v "Failed to delete subject"
./wskadmin user delete user06 | grep -v "Failed to delete subject"
@@ -35,7 +36,8 @@ cd $SCRIPTDIR
./wskadmin user create user01 -ns ns01 > $DIR/01 2> /dev/null
./wskadmin user create user02 -ns ns02 > $DIR/02 2> /dev/null
./wskadmin user create user03 -ns ns03 > $DIR/03 2> /dev/null
./wskadmin user create user04 -ns ns04 > $DIR/04 2> /dev/null
./wskadmin user create user04a -ns ns04a > $DIR/04a 2> /dev/null
./wskadmin user create user04ab -ns ns04ab > $DIR/04ab 2> /dev/null
./wskadmin user create user04b -ns ns04b > $DIR/04b 2> /dev/null
./wskadmin user create user05 -ns ns05 > $DIR/05 2> /dev/null
./wskadmin user create user06 -ns ns06 > $DIR/06 2> /dev/null
View
@@ -0,0 +1,69 @@
{
"runtimes": {
"nodejs": [
{
"kind": "nodejs",
"image": {
"prefix": "openwhisk",
"name": "nodejsaction",
"tag": "latest"
},
"deprecated": true
},
{
"kind": "nodejs:6",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "nodejs6action",
"tag": "latest"
},
"deprecated": false,
"stemCells": [{
"count": 2,
"memory": "256 MB"
}]
}
],
"python": [
{
"kind": "python",
"image": {
"prefix": "openwhisk",
"name": "nodejs6action",
"tag": "latest"
},
"deprecated": false
}
],
"swift": [
{
"kind": "swift",
"image": {
"prefix": "openwhisk",
"name": "nodejs6action",
"tag": "latest"
},
"deprecated": true
}
],
"java": [
{
"kind": "java",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "java8action",
"tag": "latest"
},
"deprecated": false,
"attached": {
"attachmentName": "jarfile",
"attachmentType": "application/java-archive"
},
"requireMain": true
}
]
},
"blackboxes": []
}
View
@@ -2,9 +2,7 @@
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
HOMEDIR="$SCRIPTDIR/../../../"
# install node and npm
#sudo apt-get -y install nodejs npm
WHISKDIR="$ROOTDIR/openwhisk"
cd $HOMEDIR

0 comments on commit 29d08da

Please sign in to comment.