diff options
Diffstat (limited to 'subversion/bindings/swig/ruby/test/test_client.rb')
| -rw-r--r-- | subversion/bindings/swig/ruby/test/test_client.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/subversion/bindings/swig/ruby/test/test_client.rb b/subversion/bindings/swig/ruby/test/test_client.rb index 5970060..9c97567 100644 --- a/subversion/bindings/swig/ruby/test/test_client.rb +++ b/subversion/bindings/swig/ruby/test/test_client.rb @@ -334,7 +334,7 @@ class SvnClientTest < Test::Unit::TestCase file = "sample.txt" deep_dir_path = File.join(@wc_path, deep_dir) path = File.join(deep_dir_path, file) - tmp_deep_dir_path = File.join(@tmp_path, deep_dir) + tmp_deep_dir_path = File.join(@import_path, deep_dir) tmp_path = File.join(tmp_deep_dir_path, file) make_context(log) do |ctx| @@ -342,7 +342,7 @@ class SvnClientTest < Test::Unit::TestCase FileUtils.mkdir_p(tmp_deep_dir_path) File.open(tmp_path, "w") {|f| f.print(src)} - ctx.import(@tmp_path, @repos_uri) + ctx.import(@import_path, @repos_uri) ctx.up(@wc_path) assert_equal(src, File.open(path){|f| f.read}) @@ -356,7 +356,7 @@ class SvnClientTest < Test::Unit::TestCase file = "sample.txt" deep_dir_path = File.join(@wc_path, deep_dir) path = File.join(deep_dir_path, file) - tmp_deep_dir_path = File.join(@tmp_path, deep_dir) + tmp_deep_dir_path = File.join(@import_path, deep_dir) tmp_path = File.join(tmp_deep_dir_path, file) make_context(log) do |ctx| @@ -364,7 +364,7 @@ class SvnClientTest < Test::Unit::TestCase FileUtils.mkdir_p(tmp_deep_dir_path) File.open(tmp_path, "w") {|f| f.print(src)} - new_rev = ctx.import(@tmp_path, @repos_uri, true, false, + new_rev = ctx.import(@import_path, @repos_uri, true, false, {"custom-prop" => "some-value"}).revision assert_equal(["some-value", new_rev], ctx.revprop_get("custom-prop", @repos_uri, new_rev)) @@ -2203,7 +2203,10 @@ class SvnClientTest < Test::Unit::TestCase make_context(log) do |ctx| items = nil - ctx.set_log_msg_func do |items| + ctx.set_log_msg_func do |l_items| + # ruby 1.8 will carry the assignment of items out of the + # scope of this block, 1.9 will not, so we must assign. + items = l_items [true, log] end @@ -2259,7 +2262,6 @@ class SvnClientTest < Test::Unit::TestCase end end config = Svn::Core::Config.config(@config_path) - assert_nil(ctx.config) assert_equal(options, config[Svn::Core::CONFIG_CATEGORY_SERVERS].to_hash) ctx.config = config assert_equal(options, |