From 0795dd7535289e68d18247be701f829580a49aee Mon Sep 17 00:00:00 2001
From: tmaruyama <tmaruyama@e93f8b46-1217-0410-a6f0-8f06a7374b81>
Date: Tue, 12 Apr 2011 12:24:43 +0000
Subject: [PATCH] scm: cvs: fix unit model cat test fails on Windows.

git-svn-id: https://svn.redmine.org/redmine/trunk@5440 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/repository_cvs_test.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index a8fc7d34c..c0f4a9a3c 100644
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -122,12 +122,14 @@ class RepositoryCvsTest < ActiveSupport::TestCase
       assert buf
       lines = buf.split("\n")
       assert_equal 2, lines.length
-      assert_equal 'with one change', lines[1]
+      buf = lines[1].gsub(/\r$/, "")
+      assert_equal 'with one change', buf
       buf = @repository.cat('README', '1')
       assert buf
       lines = buf.split("\n")
       assert_equal 1, lines.length
-      assert_equal 'CVS test repository', lines[0]
+      buf = lines[0].gsub(/\r$/, "")
+      assert_equal 'CVS test repository', buf
       assert_nil @repository.cat('missing.rb')
 
       # sources/welcome_controller.rb is removed at revision 5.
-- 
GitLab