Merge branch 'master' into devel-2.4.12
This commit is contained in:
commit
df53bdabed
@ -91,8 +91,8 @@ RAILS_ENV=test bundle exec rake redmine:dmsf_webdav_test_on
|
|||||||
# Run Webrick server
|
# Run Webrick server
|
||||||
bundle exec rails server webrick -e test -d
|
bundle exec rails server webrick -e test -d
|
||||||
|
|
||||||
# Run Litmus tests (Omit 'http' tests due to 'timeout waiting for interim response')
|
# Run Litmus tests (Omit 'http' tests due to 'timeout waiting for interim response' and locks due to complex bogus conditional)
|
||||||
TESTS="basic copymove props locks" litmus http://localhost:3000/dmsf/webdav/dmsf_test_project admin admin
|
TESTS="basic copymove props" litmus http://localhost:3000/dmsf/webdav/dmsf_test_project admin admin
|
||||||
|
|
||||||
# Shutdown Webrick
|
# Shutdown Webrick
|
||||||
kill `cat tmp/pids/server.pid`
|
kill `cat tmp/pids/server.pid`
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user