NIHVIVO-222 don't shut down Tomcat between sweets - just stop and start the app.
This commit is contained in:
parent
62e166fd6f
commit
74fc1fb5d8
1 changed files with 10 additions and 17 deletions
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
# These properties tell how to set up Selenium to run a test suite.
|
# These properties tell how to set up Selenium to run a test suite.
|
||||||
#
|
#
|
||||||
website_url = http://localhost:8080/vivo/
|
website_url = http://localhost:8080/vivo
|
||||||
suite_parent_directories = suites
|
suite_parent_directories = suites
|
||||||
output_directory = ../../.build/acceptance-tests-output
|
output_directory = ../../.build/acceptance-tests-output
|
||||||
user_extensions_path = /vitro/utilities/testrunner/selenium/user-extensions.js
|
user_extensions_path = /vitro/utilities/testrunner/selenium/user-extensions.js
|
||||||
|
@ -12,23 +12,16 @@ selenium_jar_path = /vitro/utilities/testrunner/selenium/selenium-se
|
||||||
#
|
#
|
||||||
# These properties are needed to cleanse the data model between test suites.
|
# These properties are needed to cleanse the data model between test suites.
|
||||||
#
|
#
|
||||||
# -- Windows commands for Tomcat - require startup.bat and shutdown.bat, which may not be part of the installation.
|
|
||||||
#tomcat_stop_command = "C:\\Program Files\\Apache Software Foundation\\Tomcat 6.0\\bin\\shutdown.bat"
|
|
||||||
#tomcat_start_command = "C:\\Program Files\\Apache Software Foundation\\Tomcat 6.0\\bin\\startup.bat"
|
|
||||||
#
|
|
||||||
# -- Linux commands for Tomcat
|
|
||||||
#tomcat_stop_command = /usr/local/tomcat/bin/shutdown.sh
|
|
||||||
#tomcat_start_command = /usr/local/tomcat/bin/startup.bat
|
|
||||||
|
|
||||||
tomcat_stop_command = "C:\\Program Files\\Apache Software Foundation\\Tomcat 6.0\\bin\\shutdown.bat"
|
vivo_webapp_name = vivo
|
||||||
tomcat_start_command = "C:\\Program Files\\Apache Software Foundation\\Tomcat 6.0\\bin\\startup.bat"
|
tomcat_manager_username = tomcat
|
||||||
tomcat_stop_delay = 10
|
tomcat_manager_password = tomcat
|
||||||
tomcat_start_delay = 30
|
|
||||||
mysql_username = vivoUser
|
mysql_username = vivoUser
|
||||||
mysql_password = vivoPass
|
mysql_password = vivoPass
|
||||||
mysql_dumpfile = test-model/testmodeldump.sql
|
mysql_dumpfile = test-model/testmodeldump.sql
|
||||||
mysql_db_name = vivo
|
mysql_db_name = vivo
|
||||||
upload_directory = /Vivoweb_Stuff/test_deploy/uploads
|
vivo_webapp_directory = /usr/local/tomcat//webapps/vivo
|
||||||
|
upload_directory = /usr/local/vivo/data/uploads
|
||||||
|
|
||||||
#
|
#
|
||||||
# These properties control the output formatting of the tests.
|
# These properties control the output formatting of the tests.
|
||||||
|
|
Loading…
Add table
Reference in a new issue