From 74cbbd38d0c1d401a69351409591471fe48deb15 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 24 Oct 2011 09:32:38 +0000 Subject: [PATCH] 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 --- .../scm/adapters/mercurial_adapter_test.rb | 24 +++++++++++-------- 1 file 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