From c044b5831c257e06fa35e536e50bd4d172899b9f Mon Sep 17 00:00:00 2001 From: jeb228 Date: Tue, 16 Mar 2010 16:48:22 +0000 Subject: [PATCH] NIHVIVO-76 Move ignored_tests.txt to a hard-coded location in the directory with the tests themselves. --- .../script/example.acceptance_test.properties | 1 - utilities/acceptance-tests/script/output_manager.rb | 5 +++-- utilities/acceptance-tests/suites/ignored_tests.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 utilities/acceptance-tests/suites/ignored_tests.txt diff --git a/utilities/acceptance-tests/script/example.acceptance_test.properties b/utilities/acceptance-tests/script/example.acceptance_test.properties index 62f0ba11..593d8729 100644 --- a/utilities/acceptance-tests/script/example.acceptance_test.properties +++ b/utilities/acceptance-tests/script/example.acceptance_test.properties @@ -4,7 +4,6 @@ website_url = http://localhost:8080/vivo/ test_root_directory = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/suites output_directory = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/output -ignored_tests_file = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/script/ignored_tests.txt user_extensions_path = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/selenium/user-extensions.js firefox_profile_template_path = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/selenium/firefox-profile suite_timeout_limit = 210 diff --git a/utilities/acceptance-tests/script/output_manager.rb b/utilities/acceptance-tests/script/output_manager.rb index e1e44424..7045819a 100644 --- a/utilities/acceptance-tests/script/output_manager.rb +++ b/utilities/acceptance-tests/script/output_manager.rb @@ -141,7 +141,9 @@ class OutputManager # def initialize(properties) @output_directory = properties['output_directory'] - @ignored_tests_file = properties['ignored_tests_file'] + + test_root_directory = properties['test_root_directory'] + @ignored_tests_file = File.expand_path("ignored_tests.txt", test_root_directory) sanity_checks_on_parameters() @@ -152,7 +154,6 @@ class OutputManager FileUtils::remove_file(@output_summary_file) if File.exist?(@output_summary_file) @ignored_tests = load_list_of_ignored_tests() - puts ">>>ignored tests: #{@ignored_tests}" end # Write a message to the log file diff --git a/utilities/acceptance-tests/suites/ignored_tests.txt b/utilities/acceptance-tests/suites/ignored_tests.txt new file mode 100644 index 00000000..2615e1ec --- /dev/null +++ b/utilities/acceptance-tests/suites/ignored_tests.txt @@ -0,0 +1 @@ +user-management, Bookmark Without Logging In # This test is known to fail, because not all pages come up properly if bookmarked.