summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-10-24 09:32:38 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-10-24 09:32:38 +0000
commit74cbbd38d0c1d401a69351409591471fe48deb15 (patch)
treed0991637629e0c2ef96b06fdce314d2b03fa07d6 /test
parented87fc4e66e29f10d159d3c17340615c46fedc0b (diff)
downloadredmine-74cbbd38d0c1d401a69351409591471fe48deb15.tar.gz
redmine-74cbbd38d0c1d401a69351409591471fe48deb15.zip
scm: mercurial: skip failing unit lib tests on below Mercurial 1.5 (#9465)
Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7642 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb24
1 files changed, 14 insertions, 10 deletions
diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
index 420097555..4c946ba22 100644
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -314,17 +314,21 @@ begin
assert_equal 1, nib1.size
case bra
when 'branch (1)[2]&,%.-3_4'
- assert_equal 3, nib0.size
- assert_equal nib0[0], 'afc61e85bde7'
- nib2 = @adapter.nodes_in_branch(bra, :limit => 2)
- assert_equal 2, nib2.size
- assert_equal nib2[1], '933ca60293d7'
+ if @adapter.class.client_version_above?([1, 6])
+ assert_equal 3, nib0.size
+ assert_equal nib0[0], 'afc61e85bde7'
+ nib2 = @adapter.nodes_in_branch(bra, :limit => 2)
+ assert_equal 2, nib2.size
+ assert_equal nib2[1], '933ca60293d7'
+ end
when @branch_char_1
- assert_equal 2, nib0.size
- assert_equal nib0[1], '08ff3227303e'
- nib2 = @adapter.nodes_in_branch(bra, :limit => 1)
- assert_equal 1, nib2.size
- assert_equal nib2[0], '7bbf4c738e71'
+ if @adapter.class.client_version_above?([1, 6])
+ assert_equal 2, nib0.size
+ assert_equal nib0[1], '08ff3227303e'
+ nib2 = @adapter.nodes_in_branch(bra, :limit => 1)
+ assert_equal 1, nib2.size
+ assert_equal nib2[0], '7bbf4c738e71'
+ end
end
end
end