Download as
Browse Code »

Commit 37a51f8c3841c8784b4889adbe834b72ea24e372

Authored by Antonio Terceiro
1 parent b50c135a
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

test_helper: make IP addresses available as variables

Showing 2 changed files with 11 additions and 2 deletions   Show diff stats
test/colab_test.sh
  Diff comments   View file @37a51f8
@@ -21,8 +21,7 @@ test_nginx_responds() { @@ -21,8 +21,7 @@ test_nginx_responds() {
21 } 21 }
22 22
23 test_nginx_virtualhost() { 23 test_nginx_virtualhost() {
24 - local ip="$(grep integration: nodes.yaml | cut -d : -f 2)"  
25 - local title="$(./test/bin/curl http://$ip/dashboard | grep '<title>' | sed -e 's/^\s*//')" 24 + local title="$(./test/bin/curl http://$integration/dashboard | grep '<title>' | sed -e 's/^\s*//')"
26 assertEquals "<title>Home - Colab</title>" "$title" 25 assertEquals "<title>Home - Colab</title>" "$title"
27 } 26 }
28 27
test/test_helper.sh
  Diff comments   View file @37a51f8
@@ -5,3 +5,13 @@ run_on() { @@ -5,3 +5,13 @@ run_on() {
5 } 5 }
6 6
7 curl=/vagrant/test/bin/curl 7 curl=/vagrant/test/bin/curl
  8 +
  9 +# make IP addresses avaliable at the environment so we can refer to hosts by
  10 +# name, e.g.
  11 +#
  12 +# curl http://$reverseproxy
  13 +# nmap -p 5423 $database
  14 +#
  15 +# Each node in the `peers:` entry in nodes.yaml will have its own variable
  16 +#
  17 +eval $(ruby -ryaml -e 'YAML.load_file("nodes.yaml").first[1]["peers"].each { |k,v| puts "#{k}=#{v}" }')