Commit d3d9c0d615ac31751d90032039988efd7e62a609

Authored by Athos
1 parent 5d043b88
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

Add function to load shunit2

The shunit2 packages on official Red Hat like distributions do not place the
executables in any directory in the user PATH. According to the
packager, the package is a library for unit testing and the executable
is meant to be included by the users' unit tests.
test/colab_test.sh
... ... @@ -29,4 +29,4 @@ test_reverse_proxy_gitlab() {
29 29 assertTrue 'Reverse proxy for gitlab' "curl --header 'Host: softwarepublico.dev' http://$integration/gitlab/public/projects | grep -i '<meta.*gitlab.*>'"
30 30 }
31 31  
32   -. shunit2
  32 +load_shunit2
... ...
test/gitlab_test.sh
... ... @@ -22,4 +22,4 @@ test_redirects_to_the_correct_host() {
22 22 assertEquals "Location: https://softwarepublico.dev/gitlab/users/sign_in" "$redirect"
23 23 }
24 24  
25   -. shunit2
  25 +load_shunit2
... ...
test/mail_relay_test.sh
... ... @@ -40,5 +40,5 @@ test_outbound_email_reverseproxy() {
40 40 _test_outbound_email reverseproxy
41 41 }
42 42  
43   -. shunit2
  43 +load_shunit2
44 44  
... ...
test/mailman_api_test.sh
... ... @@ -4,5 +4,5 @@ test_mailman_api_running() {
4 4 assertTrue 'mailman running' 'run_on integration pgrep -fa mailman-api'
5 5 }
6 6  
7   -. shunit2
  7 +load_shunit2
8 8  
... ...
test/mailman_test.sh
... ... @@ -25,4 +25,4 @@ test_mailman_web_interface() {
25 25 assertEquals "<TITLE>listas.softwarepublico.dev Mailing Lists</TITLE>" "$title"
26 26 }
27 27  
28   -. shunit2
  28 +load_shunit2
... ...
test/postgresql_test.sh
... ... @@ -12,5 +12,5 @@ test_gitlab_database_created() {
12 12 assertTrue 'gitlab database created in PostgreSQL' 'run_on database sudo -u postgres -i psql gitlab < /dev/null'
13 13 }
14 14  
15   -. shunit2
  15 +load_shunit2
16 16  
... ...
test/redis_test.sh
... ... @@ -8,4 +8,4 @@ test_redis_listens_on_local_network() {
8 8 assertTrue 'redis listening on local network' 'nc -z -w 1 $database 6379'
9 9 }
10 10  
11   -. shunit2
  11 +load_shunit2
... ...
test/reverse_proxy_test.sh
... ... @@ -15,4 +15,4 @@ test_redirect_http_to_mailman() {
15 15 assertEquals "<TITLE>listas.softwarepublico.dev Mailing Lists</TITLE>" "$title"
16 16 }
17 17  
18   -. shunit2
  18 +load_shunit2
... ...
test/test_helper.sh
... ... @@ -7,4 +7,15 @@ run_on() {
7 7 echo 'export PATH=/vagrant/test/bin:$PATH;' "$@" | ssh -F .ssh_config "$vm"
8 8 }
9 9  
  10 +load_shunit2() {
  11 + if [ `which shunit2 > /dev/null 2>&1` ]; then
  12 + . shunit2
  13 + elif [ -e /usr/share/shunit2/shunit2 ]; then
  14 + . /usr/share/shunit2/shunit2
  15 + else
  16 + echo "Could not find shunit2, please, make sure you have it installed."
  17 + fi
  18 +}
  19 +
10 20 . $(dirname $0)/ip_helper.sh
  21 +
... ...