Kou, Joe,
This fixes a ruby test failure on trunk, some variation thereof fixes the
failure on 1.5.x. My ruby-test-swig-fu is pretty weak, so I'm posting here
before committing. If either of you could look at it, that'd be great.
-Hyrum
[[[
* subversion/bindings/swig/ruby/test/test_wc.rb
(test_relocate): Fix a ruby test expectation.
]]]
Index: subversion/bindings/swig/ruby/test/test_wc.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test_wc.rb (revision 34821)
+++ subversion/bindings/swig/ruby/test/test_wc.rb (working copy)
@@ -995,10 +995,14 @@
assert_equal([
[@fs.uuid, dir2_uri, nil],
[@fs.uuid, dir2_uri, dir2_uri],
- [nil, "#{dir2_uri}/#{dir1}", dir2_uri],
- [nil, "#{dir2_uri}/#{dir1}/#{file1}", dir2_uri],
- [nil, "#{dir2_uri}/#{dir2}", dir2_uri],
- [nil, "#{dir2_uri}/#{dir2}/#{file2}", dir2_uri],
+ [@fs.uuid, "#{dir2_uri}/#{dir1}", nil],
+ [@fs.uuid, "#{dir2_uri}/#{dir1}", dir2_uri],
+ [@fs.uuid, "#{dir2_uri}/#{dir1}/#{file1}", nil],
+ [@fs.uuid, "#{dir2_uri}/#{dir1}/#{file1}", dir2_uri],
+ [@fs.uuid, "#{dir2_uri}/#{dir2}", nil],
+ [@fs.uuid, "#{dir2_uri}/#{dir2}", dir2_uri],
+ [@fs.uuid, "#{dir2_uri}/#{dir2}/#{file2}", nil],
+ [@fs.uuid, "#{dir2_uri}/#{dir2}/#{file2}", dir2_uri],
],
values)
assert(dir2_uri, access.entry(@wc_path).url)
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=986958
Received on 2008-12-18 21:40:32 CET