Commit
b50c135a92eeab7b445530ec66a44264a61b1ba6
Exists in
master
and in
65 other branches
3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes
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
|
| @@ -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 |
