litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-76 Make the tests enabled again,

Browse source
This commit is contained in:
jeb228 2010-03-15 20:23:04 +00:00
parent 310f3d484d
commit 8b5c82cb6c
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
utilities/acceptance-tests/script/run_acceptance_tests.rb
View file

@ -119,7 +119,7 @@ class AcceptanceRunner
def confirm_is_readable_file(path, label) def confirm_is_readable_file(path, label)
confirm_is_readable(path, label) confirm_is_readable(path, label)
if !File.file?(path) if !File.file?(path)
raise "#{label} '#{path}' is not a directory." raise "#{label} '#{path}' is not a file."
end end
end end
@ -155,9 +155,7 @@ class AcceptanceRunner
get_sub_directories(@test_root_directory).each do |suite_path| get_sub_directories(@test_root_directory).each do |suite_path|
suite_file_path = File.expand_path("Suite.html", suite_path) suite_file_path = File.expand_path("Suite.html", suite_path)
if File.exist?(suite_file_path) if File.exist?(suite_file_path)
# BOGUS - disable the tests. cleanse_data_model()
# cleanse_data_model()
# BOGUS - disable the tests.
run_test_suite(suite_file_path) run_test_suite(suite_file_path)
else else
log_warn("No suite file found in #{suite_path}") log_warn("No suite file found in #{suite_path}")
@ -184,11 +182,11 @@ class AcceptanceRunner
args << "-firefoxProfileTemplate" << @firefox_profile_template_path args << "-firefoxProfileTemplate" << @firefox_profile_template_path
args << "-htmlSuite" << "*firefox" << @website_url << suite_file_path << output_file args << "-htmlSuite" << "*firefox" << @website_url << suite_file_path << output_file
# result = system("java", *args) result = system("java", *args)
# raise("Can't find the 'java' command!") if result == nil raise("Can't find the 'java' command!") if result == nil
# if $?.exitstatus != 0 if $?.exitstatus != 0
# log_error("Suite failed at '#{suite_file_path}: return code was #{$?.exitstatus}, command was 'java' #{args}") log_warn("Suite failed: '#{suite_name}, return code was #{$?.exitstatus}")
# end end
end end
def time_stamp(label) def time_stamp(label)