Commit
6e01ed62420cae33e54cf290342e889f151a0880
Authored by
Athos
2015-03-19 12:11:50 -0300
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 test_helper.sh to point to the right SSH config file
In 23a78, we forgot to run the tests with the new SSH config files, this
commit fixes that. Note that it sets the SPB_ENV variable on calling
tests/run_all in the Rakefile. Maybe we want to call that explicitly, if
so, we should remove the Rakefile change.
Signed-off-by: Carolina Ramalho <carol15022@hotmail.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
@@ -31,7 +31,7 @@ task :console do
@@ -31,7 +31,7 @@ task :console do
31
end
31
end
32
32
33
task :test do
33
task :test do
34
- sh './test/run_all'
34
+ sh "SPB_ENV=#{$SPB_ENV} ./test/run_all"
35
end
35
end
36
36
37
task :default => :test
37
task :default => :test
@@ -4,7 +4,7 @@ export ROOTDIR="$(dirname $0)/.."
@@ -4,7 +4,7 @@ export ROOTDIR="$(dirname $0)/.."
4
run_on() {
4
run_on() {
5
local vm="$1"
5
local vm="$1"
6
shift
6
shift
7
- echo 'export PATH=/vagrant/test/bin:$PATH;' "$@" | ssh -F . ssh_config "$vm"
7
+ echo 'export PATH=/vagrant/test/bin:$PATH;' "$@" | ssh -F config/$SPB_ENV/ ssh_config "$vm"
8
}
8
}
9
9
10
load_shunit2() {
10
load_shunit2() {
