Commit f7332f4793472a4763d79ff3c1978bec8e5f604a
1 parent
a435fc6c
Exists in
r5_design
and in
1 other branch
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
test/colab_test.sh
| @@ -13,11 +13,11 @@ test_colab_running() { | @@ -13,11 +13,11 @@ test_colab_running() { | ||
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | test_colab_responds() { | 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 | test_nginx_responds() { | 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 | test_nginx_virtualhost() { | 23 | test_nginx_virtualhost() { |
test/ip_helper.sh
| @@ -6,5 +6,6 @@ | @@ -6,5 +6,6 @@ | ||
| 6 | # | 6 | # |
| 7 | # Each node in the `peers:` entry in nodes.yaml will have its own variable | 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 |