← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to debian/patches/ruby-test-core

  • Committer: Michael Diers
  • Date: 2010-05-12 13:55:27 UTC
  • mfrom: (0.4.1 squeeze)
  • Revision ID: mdiers@elego.de-20100512135527-r9n2rmn7zlxio5iy
subversion (1.6.9dfsg-1ubuntu0svn1) lucid
  
Merge with 1.6.9dfsg-1 from lp:debian/squeeze/subversion, revno:6.
  
The package name suffix "1ubuntu0svn1" is carefully chosen.
See https://lists.launchpad.net/svn/msg00002.html and
https://answers.launchpad.net/soyuz/+question/105396 for an
explanation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ruby-test-core
1
 
Fix a ruby test failure.
2
 
From upstream r40088; will probably be in 1.6.7.
3
 
 
4
 
--- a/subversion/bindings/swig/ruby/test/test_core.rb
5
 
+++ b/subversion/bindings/swig/ruby/test/test_core.rb
6
 
@@ -628,9 +628,8 @@
7
 
     assert_raises(Svn::Error::BadFilename) do
8
 
       Svn::Core::MimeType.detect(nonexistent_html_file)
9
 
     end
10
 
-    assert_raises(Svn::Error::BadFilename) do
11
 
-      Svn::Core::MimeType.detect(nonexistent_html_file, type_map)
12
 
-    end
13
 
+    assert_equal("text/html",
14
 
+                 Svn::Core::MimeType.detect(nonexistent_html_file, type_map))
15
 
 
16
 
     empty_html_file = File.join(@tmp_path, "empty.html")
17
 
     FileUtils.touch(empty_html_file)