From c6e758a258471a68ae1629ef4446d85ef003b50d Mon Sep 17 00:00:00 2001 From: jeb228 Date: Wed, 10 Mar 2010 14:32:32 +0000 Subject: [PATCH] NIHVIVO-76 Add suite_timeout_limit and selenium_jar_path to the example properties, and make the examples Unix-oriented instead of Windows-oriented. --- .../script/example.acceptance_test.properties | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/utilities/acceptance-tests/script/example.acceptance_test.properties b/utilities/acceptance-tests/script/example.acceptance_test.properties index e4225dc2..cbaf2378 100644 --- a/utilities/acceptance-tests/script/example.acceptance_test.properties +++ b/utilities/acceptance-tests/script/example.acceptance_test.properties @@ -2,18 +2,20 @@ # These properties tell how to set up Selenium to run a test suite. # website_url = http://localhost:8080/vivo/ -test_root_directory = C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\suites -output_directory = C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\script\\output -user_extensions_path = C:\\eclipseVitroWorkspace\\vivoweb\\utilities\\acceptance-tests\\selenium\\user-extensions.js -firefox_profile_template_path = C:\\Vitro_stuff\\Selenium\\experiments\\profiles\\selenium +test_root_directory = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/suites +output_directory = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/output +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 = 180 +selenium_jar_path = /home/jeb228/Documents/workspaces/vivo/utilities/acceptance-tests/selenium/selenium-server.jar # # These properties are needed to cleanse the data model between test suites. # -tomcat_stop_command = java -Dcatalina.home="C:\Program Files\Apache Software Foundation\Tomcat 6.0" -jar "c:\Program Files\Apache Software Foundation\Tomcat 6.0\bin\bootstrap.jar" stop -tomcat_stop_delay = 3 -tomcat_start_command = start java -Dcatalina.home="C:\Program Files\Apache Software Foundation\Tomcat 6.0" -jar "C:\Program Files\Apache Software Foundation\Tomcat 6.0\bin\bootstrap.jar" -tomcat_start_delay = 180 +tomcat_stop_command = /usr/local/tomcat/bin/shutdown.sh +tomcat_stop_delay = 2 +tomcat_start_command = /usr/local/tomcat/bin/startup.sh +tomcat_start_delay = 180 mysql_username = vitrodbUsername mysql_password = vitrodbPassword database_name = vivo