Download as
Browse Code »

Commit f7332f4793472a4763d79ff3c1978bec8e5f604a

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

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
  Diff comments   View file @f7332f4
... ... @@ -5,6 +5,7 @@ set -e
5 5 unset http_proxy
6 6 unset https_proxy
7 7  
  8 +ROOTDIR=$(readlink -f $(dirname $0)/../..)
8 9 . $(dirname $0)/../ip_helper.sh
9 10  
10 11 /usr/bin/curl \
... ...
test/colab_test.sh
  Diff comments   View file @f7332f4
... ... @@ -13,11 +13,11 @@ test_colab_running() {
13 13 }
14 14  
15 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 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 23 test_nginx_virtualhost() {
... ...
test/ip_helper.sh
  Diff comments   View file @f7332f4
... ... @@ -6,5 +6,6 @@
6 6 #
7 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  
... ...
test/test_helper.sh
  Diff comments   View file @f7332f4
1 1 export PATH="$(dirname $0)/bin:$PATH"
  2 +export ROOTDIR="$(readlink -f $(dirname $0)/..)"
2 3  
3 4 run_on() {
4 5 local vm="$1"
... ...