Download as
Browse Code »

Commit f7332f4793472a4763d79ff3c1978bec8e5f604a

Authored by Antonio Terceiro
1 parent a435fc6c
Exists in r5_design and in 1 other branch design_41_backup

Rearrange testing infrastructure 

- ip_helper: don't depend on ruby
- colab_tests: use new curl-host script that avoids parameter passing
  problems with `ssh HOST COMMAND`
Showing 4 changed files with 6 additions and 3 deletions   Show diff stats
test/bin/curl
  Diff comments   View file @f7332f4
... ... @@ -5,6 +5,7 @@ set -e
5 5 unset http_proxy
6 6 unset https_proxy
7 7  
  8 +ROOTDIR=$(readlink -f $(dirname $0)/../..)
8 9 . $(dirname $0)/../ip_helper.sh
9 10  
10 11 /usr/bin/curl \
... ...
test/colab_test.sh
  Diff comments   View file @f7332f4
... ... @@ -13,11 +13,11 @@ test_colab_running() {
13 13 }
14 14  
15 15 test_colab_responds() {
16   - assertTrue 'colab responds' "run_on integration curl --header 'Host: softwarepublico.dev' http://localhost:8001"
  16 + assertTrue 'colab responds' "run_on integration curl-host 'softwarepublico.dev' http://localhost:8001"
17 17 }
18 18  
19 19 test_nginx_responds() {
20   - assertTrue 'nginx reponds' "run_on integration curl --header 'Host: softwarepublico.dev' http://localhost"
  20 + assertTrue 'nginx reponds' "run_on integration curl-host 'softwarepublico.dev' http://localhost"
21 21 }
22 22  
23 23 test_nginx_virtualhost() {
... ...
test/ip_helper.sh
  Diff comments   View file @f7332f4
... ... @@ -6,5 +6,6 @@
6 6 #
7 7 # Each node in the `peers:` entry in nodes.yaml will have its own variable
8 8 #
9   -eval $(ruby -ryaml -e 'YAML.load_file("nodes.yaml").first[1]["peers"].each { |k,v| puts "#{k}=#{v}" }')
  9 +
  10 +eval $(sed -e '/\S*:\s*[0-9]\+\./!d; s/^\s*//; s/:\s*/=/' ${ROOTDIR:-/vagrant}/nodes.yaml)
10 11  
... ...
test/test_helper.sh
  Diff comments   View file @f7332f4
1 1 export PATH="$(dirname $0)/bin:$PATH"
  2 +export ROOTDIR="$(readlink -f $(dirname $0)/..)"
2 3  
3 4 run_on() {
4 5 local vm="$1"
... ...