'rake test' croaks

Ruby Apps Typo
1

What goes on here?

Thanks,
Hal

[root@www typo]# rake --trace test
(in /root/typo)
** Invoke test (first_time)
** Execute test
** Invoke test:units (first_time)
** Invoke db:test:prepare (first_time)
** Invoke environment (first_time)
** Execute environment
** Execute db:test:prepare
** Invoke db:test:clone (first_time)
** Invoke db:schema:dump (first_time)
** Invoke environment
** Execute db:schema:dump
** Execute db:test:clone
** Invoke db:schema:load (first_time)
** Invoke environment
** Execute db:schema:load
** Invoke test:functionals (first_time)
** Invoke db:test:prepare
** Execute test:functionals
/usr/local/bin/ruby -Ilib:test
“/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake/rake_test_loader.rb”
“test/functional/accounts_controller_test.rb”
“test/functional/xml_controller_test.rb”
“test/functional/articles_controller_test.rb”
“test/functional/backend_controller_test.rb”
“test/functional/theme_controller_test.rb”
“test/functional/textfilter_controller_test.rb”
“test/functional/redirect_controller_test.rb”
“test/functional/admin/categories_controller_test.rb”
“test/functional/admin/general_controller_test.rb”
“test/functional/admin/users_controller_test.rb”
“test/functional/admin/trackbacks_controller_test.rb”
“test/functional/admin/comments_controller_test.rb”
“test/functional/admin/themes_controller_test.rb”
“test/functional/admin/blacklist_controller_test.rb”
“test/functional/admin/content_controller_test.rb”
“test/functional/admin/resources_controller_test.rb”
“test/functional/admin/pages_controller_test.rb”
“test/functional/admin/textfilters_controller_test.rb”
“test/functional/admin/article_preview_test.rb”

/root/typo/config/…/app/controllers/xml_controller.rb:84: warning:
parenthesize
argument(s) for future version
/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:21:in
`require__’:
/root/typo/config/…/app/controllers/xml_controller.rb:72: parse error
(SyntaxError)
<<<<<<< .mine
^
/root/typo/config/…/app/controllers/xml_controller.rb:88: parse error

^

/root/typo/config/…/app/controllers/xml_controller.rb:139: parse error

.r1055
^ from
/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:21:in
require' from /root/typo/config/../vendor/rails/activerecord/lib/../../activesupport/lib/active_support/dependencies.rb:147:inrequire’
from ./test/functional/xml_controller_test.rb:2
from
/root/typo/config/…/vendor/rails/activerecord/lib/…/…/activesupport/lib/active_support/dependencies.rb:140:in
load' from /root/typo/config/../vendor/rails/activerecord/lib/../../activesupport/lib/active_support/dependencies.rb:140:inload’
from
/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake/rake_test_loader.rb:5
from
/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake/rake_test_loader.rb:5:in
each' from /usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake/rake_test_loader.rb:5 rake aborted! Test failures /root/typo/config/../vendor/rails/railties/lib/tasks/testing.rake:35 /root/typo/config/../vendor/rails/railties/lib/tasks/testing.rake:27:incall’
/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:387:in
execute' /usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:387:ineach’
/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:387:in
execute' /usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:357:ininvoke’
/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:350:in
synchronize' /usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:350:ininvoke’
/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:1906:in run' /usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:1906:ineach’
/usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/lib/rake.rb:1906:in run' /usr/local/lib/ruby/gems/1.8/gems/rake-0.7.1/bin/rake:7 /usr/local/bin/rake:18:inload’
/usr/local/bin/rake:18

2

You edited a file, then updated svn, and had a conflict.