Merged r4644 and r4674 from trunk (mercurial unit app test).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4675 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index 27e45fcc1f6b5becc81040f1b33cba90e1547783..0938c824b0fc6f9e74d6abf26c54d8ec8ea7cf27 100644 (file)
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -102,7 +102,8 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
       @repository.reload
 
       cs1 = @repository.changesets.find_by_revision('13')
-      c1  = cs1.changes
+      assert_not_nil cs1
+      c1  = cs1.changes.sort_by(&:path)
       assert_equal 2, c1.size
 
       assert_equal 'A', c1[0].action