From 711328d172d18e0413e1a082dee78a82a3d17950 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 19 Jun 2012 02:10:55 +0000 Subject: [PATCH] Merge r9870 from trunk scm: git: fix unable to run unit lib test if git binary is not available on Windows. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9872 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../redmine/scm/adapters/git_adapter_test.rb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 50100d1ff..b730cd5e2 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -10,16 +10,6 @@ begin FELIX_HEX = "Felix Sch\xC3\xA4fer" CHAR_1_HEX = "\xc3\x9c" - ## Ruby uses ANSI api to fork a process on Windows. - ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem - ## and these are incompatible with ASCII. - ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10 - ## http://code.google.com/p/msysgit/issues/detail?id=80 - ## So, Latin-1 path tests fail on Japanese Windows - WINDOWS_PASS = (Redmine::Platform.mswin? && - Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10])) - WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10" - ## Git, Mercurial and CVS path encodings are binary. ## Subversion supports URL encoding for path. ## Redmine Mercurial adapter and extension use URL encoding. @@ -29,6 +19,16 @@ begin JRUBY_SKIP_STR = "TODO: This test fails in JRuby" if File.directory?(REPOSITORY_PATH) + ## Ruby uses ANSI api to fork a process on Windows. + ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem + ## and these are incompatible with ASCII. + ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10 + ## http://code.google.com/p/msysgit/issues/detail?id=80 + ## So, Latin-1 path tests fail on Japanese Windows + WINDOWS_PASS = (Redmine::Platform.mswin? && + Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10])) + WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10" + def setup adapter_class = Redmine::Scm::Adapters::GitAdapter assert adapter_class -- 2.39.5