Download as
Browse Code »

Commit b50c135a92eeab7b445530ec66a44264a61b1ba6

Authored by Antonio Terceiro
1 parent 51e49fee
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, 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
Showing 3 changed files with 18 additions and 3 deletions   Show diff stats
test/bin/curl 0 → 100755
  Diff comments   View file @b50c135
... ... @@ -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 + "$@"
... ...
test/colab_test.sh
  Diff comments   View file @b50c135
... ... @@ -13,16 +13,16 @@ test_colab_running() {
13 13 }
14 14  
15 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 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 23 test_nginx_virtualhost() {
24 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 26 assertEquals "<title>Home - Colab</title>" "$title"
27 27 }
28 28  
... ...
test/test_helper.sh
  Diff comments   View file @b50c135
... ... @@ -3,3 +3,5 @@ run_on() {
3 3 shift
4 4 vagrant ssh "$vm" -- "$@"
5 5 }
  6 +
  7 +curl=/vagrant/test/bin/curl
... ...