jro_apps/redmine Commit - r9668:e757600b3984

Merge r9750 from trunk...

Toshi MARUYAMA -

r9668:e757600b3984

parent child

Context file:

r9668:e757600b3984

Collapse all files

test/functional/repositories_git_controller_test.rb +14 0

               CHAR_1_HEX = "\xc3\x9c"
               NUM_REV = 28
+              ## 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.
                 def test_entry_show_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
+                  elsif WINDOWS_PASS
+                    puts WINDOWS_SKIP_STR
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                 def test_annotate_latin_1
                   if @ruby19_non_utf8_pass
                     puts_ruby19_non_utf8_pass()
+                  elsif WINDOWS_PASS
+                    puts WINDOWS_SKIP_STR
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +8 -4

                 ## 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.
-                # WINDOWS_PASS = Redmine::Platform.mswin?
+                ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
-                WINDOWS_PASS = false
+                ## 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.
                   def test_latin_1_path
                     if WINDOWS_PASS
+                      puts WINDOWS_SKIP_STR
                     elsif JRUBY_SKIP
                       puts JRUBY_SKIP_STR
                     else
                   def test_entries_latin_1_dir
                     if WINDOWS_PASS
+                      puts WINDOWS_SKIP_STR
                     elsif JRUBY_SKIP
                       puts JRUBY_SKIP_STR
                     else

test/unit/repository_git_test.rb +10 -4

               ## 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.
-              # WINDOWS_PASS = Redmine::Platform.mswin?
+              ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
-              WINDOWS_PASS = false
+              ## 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.
                           '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                       ], changesets.collect(&:revision)
-                  if JRUBY_SKIP
+                  if WINDOWS_PASS
+                    puts WINDOWS_SKIP_STR
+                  elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     # latin-1 encoding path
                 def test_latest_changesets_latin_1_dir
                   if WINDOWS_PASS
+                    puts WINDOWS_SKIP_STR
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages