Fix tests

that --header 'Host: [...]' gets messed up by vagrant ssh, so let's encapsulate all the common curl options we want to use all the time into a single curl wrapper in test/bin/curl

Fix tests
that --header 'Host: [...]' gets messed up by vagrant ssh, so let's encapsulate all the common curl options we want to use all the time into a single curl wrapper in test/bin/curl
Antonio Terceiro
1 parent 51e49fee
Showing 3 changed files with 18 additions and 3 deletions Show diff stats
test/bin/curl
test/colab_test.sh
test/test_helper.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+unset http_proxy
+unset https_proxy
+
+/usr/bin/curl \
+  --silent \
+  --noproxy '*' \
+  --fail \
+  --header 'Host: softwarepublico.dev' \
+  "$@"
@@ -13,16 +13,16 @@ test_colab_running() {
 }
 test_colab_responds() {
-  assertTrue 'colab responds' 'run_on integration curl --fail http://localhost:8001'
+  assertTrue 'colab responds' "run_on integration $curl http://localhost:8001"
 }
 test_nginx_responds() {
-  assertTrue 'nginx reponds' 'run_on integration curl --fail http://localhost'
+  assertTrue 'nginx reponds' "run_on integration $curl http://localhost"
 }
 test_nginx_virtualhost() {
   local ip="$(grep integration: nodes.yaml | cut -d : -f 2)"
-  local title="$(curl --silent --header 'Host: beta.softwarepublico.gov.br' http://$ip/dashboard | grep '<title>' | sed -e 's/^\s*//')"
+  local title="$(./test/bin/curl http://$ip/dashboard | grep '<title>' | sed -e 's/^\s*//')"
   assertEquals "<title>Home - Colab</title>" "$title"
 }
@@ -3,3 +3,5 @@ run_on() {
   shift
   vagrant ssh "$vm" -- "$@"
 }
+
+curl=/vagrant/test/bin/curl
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+#!/bin/sh
	2	+
	3	+set -e
	4	+
	5	+unset http_proxy
	6	+unset https_proxy
	7	+
	8	+/usr/bin/curl \
	9	+ --silent \
	10	+ --noproxy '*' \
	11	+ --fail \
	12	+ --header 'Host: softwarepublico.dev' \
	13	+ "$@"
	@@ -13,16 +13,16 @@ test_colab_running() {		@@ -13,16 +13,16 @@ test_colab_running() {
13	}	13	}
14		14
15	test_colab_responds() {	15	test_colab_responds() {
16	- assertTrue 'colab responds' 'run_on integration curl --fail http://localhost:8001'	16	+ assertTrue 'colab responds' "run_on integration $curl http://localhost:8001"
17	}	17	}
18		18
19	test_nginx_responds() {	19	test_nginx_responds() {
20	- assertTrue 'nginx reponds' 'run_on integration curl --fail http://localhost'	20	+ assertTrue 'nginx reponds' "run_on integration $curl http://localhost"
21	}	21	}
22		22
23	test_nginx_virtualhost() {	23	test_nginx_virtualhost() {
24	local ip="$(grep integration: nodes.yaml \| cut -d : -f 2)"	24	local ip="$(grep integration: nodes.yaml \| cut -d : -f 2)"
25	- local title="$(curl --silent --header 'Host: beta.softwarepublico.gov.br' http://$ip/dashboard \| grep '<title>' \| sed -e 's/^\s*//')"	25	+ local title="$(./test/bin/curl http://$ip/dashboard \| grep '<title>' \| sed -e 's/^\s*//')"
26	assertEquals "<title>Home - Colab</title>" "$title"	26	assertEquals "<title>Home - Colab</title>" "$title"
27	}	27	}
28		28
	@@ -3,3 +3,5 @@ run_on() {		@@ -3,3 +3,5 @@ run_on() {
3	shift	3	shift
4	vagrant ssh "$vm" -- "$@"	4	vagrant ssh "$vm" -- "$@"
5	}	5	}
		6	+
		7	+curl=/vagrant/test/bin/curl