kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: mercurial: use scmid_for_assert in assert_parents (#14361)

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@12775 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-02-02 12:20:32 +00:00
parent 58d906446d
commit f9e7c24733
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/unit/repository_mercurial_test.rb
View File

@ -433,18 +433,23 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
end end
end end
def assert_parents def assert_parents(is_short_scmid=true)
r1 = @repository.changesets.find_by_revision('0') r1 = @repository.changesets.find_by_revision('0')
assert_equal [], r1.parents assert_equal [], r1.parents
r2 = @repository.changesets.find_by_revision('1') r2 = @repository.changesets.find_by_revision('1')
hex2 = "0885933ad4f68d77c2649cd11f8311276e7ef7ce"
scmid2 = scmid_for_assert(hex2, is_short_scmid)
assert_equal 1, r2.parents.length assert_equal 1, r2.parents.length
assert_equal "0885933ad4f6", assert_equal scmid2, r2.parents[0].identifier
r2.parents[0].identifier
r3 = @repository.changesets.find_by_revision('30') r3 = @repository.changesets.find_by_revision('30')
assert_equal 2, r3.parents.length assert_equal 2, r3.parents.length
r4 = [r3.parents[0].identifier, r3.parents[1].identifier].sort r4 = [r3.parents[0].identifier, r3.parents[1].identifier].sort
assert_equal "3a330eb32958", r4[0] hex41 = "3a330eb329586ea2adb3f83237c23310e744ebe9"
assert_equal "a94b0528f24f", r4[1] scmid41 = scmid_for_assert(hex41, is_short_scmid)
hex42 = "a94b0528f24fe05ebaef496ae0500bb050772e36"
scmid42 = scmid_for_assert(hex42, is_short_scmid)
assert_equal scmid41, r4[0]
assert_equal scmid42, r4[1]
end end
private :assert_parents private :assert_parents
@ -453,7 +458,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
assert_parents assert_parents(true)
end end
def test_activities def test_activities