From b6dbf26c865680fd012086682e7ba99c9b5bcef3 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 17 Aug 2011 08:16:02 +0000 Subject: [PATCH] Merged r6004 from trunk. scm: git: skip non UTF-8 path encoding test of unit adapter test in JRuby. Git, Mercurial and CVS path encodings are binary. Subversion supports URL encoding for path. Redmine Mercurial adapter and extension use URL encoding. Git accepts only binary path in command line parameter. So, there is no way to use binary command line parameter in JRuby. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6451 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../lib/redmine/scm/adapters/git_adapter_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb index 42cc78071..2c7fd89c3 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -20,6 +20,14 @@ begin # WINDOWS_PASS = Redmine::Platform.mswin? WINDOWS_PASS = false + ## Git, Mercurial and CVS path encodings are binary. + ## Subversion supports URL encoding for path. + ## Redmine Mercurial adapter and extension use URL encoding. + ## Git accepts only binary path in command line parameter. + ## So, there is no way to use binary command line parameter in JRuby. + JRUBY_SKIP = (RUBY_PLATFORM == 'java') + JRUBY_SKIP_STR = "TODO: This test fails in JRuby" + if File.directory?(REPOSITORY_PATH) def setup adapter_class = Redmine::Scm::Adapters::GitAdapter @@ -262,6 +270,8 @@ begin def test_latin_1_path if WINDOWS_PASS # + elsif JRUBY_SKIP + puts JRUBY_SKIP_STR else p2 = "latin-1-dir/test-#{@char_1}-2.txt" ['4fc55c43bf3d3dc2efb66145365ddc17639ce81e', '4fc55c43bf3'].each do |r1| @@ -322,6 +332,8 @@ begin def test_entries_latin_1_dir if WINDOWS_PASS # + elsif JRUBY_SKIP + puts JRUBY_SKIP_STR else entries1 = @adapter.entries("latin-1-dir/test-#{@char_1}-subdir", '1ca7f5ed') -- 2.39.5