Patchwork test-convert-svn-move: sort svn checkout output

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date Jan. 18, 2018, 3:14 a.m.
Message ID <358f30e953d94c13d0db.1516245254@Iris>
Download mbox | patch
Permalink /patch/26837/
State Accepted
Headers show

Comments

Jordi Gutiérrez Hermoso - Jan. 18, 2018, 3:14 a.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1516245130 18000
#      Wed Jan 17 22:12:10 2018 -0500
# Node ID 358f30e953d94c13d0dbf4c149130ab69f2c76bf
# Parent  3a379eceab7886ae9a8f661c648c2759c69a9013
test-convert-svn-move: sort svn checkout output

It turns out that there's no guarantee in which order svn will
traverse a directory while performing a checkout. Sorting the output
will make these tests stable.
Yuya Nishihara - Jan. 18, 2018, 11:47 a.m.
On Wed, 17 Jan 2018 22:14:14 -0500, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1516245130 18000
> #      Wed Jan 17 22:12:10 2018 -0500
> # Node ID 358f30e953d94c13d0dbf4c149130ab69f2c76bf
> # Parent  3a379eceab7886ae9a8f661c648c2759c69a9013
> test-convert-svn-move: sort svn checkout output

Queued, thanks.

Patch

diff --git a/tests/test-convert-svn-source.t b/tests/test-convert-svn-source.t
--- a/tests/test-convert-svn-source.t
+++ b/tests/test-convert-svn-source.t
@@ -268,7 +268,7 @@  try converting when we have an svn subre
   $ cd withmerge
   $ echo "subrepo = [svn]$SVNREPOURL" >.hgsub
   $ hg add .hgsub
-  $ svn checkout "$SVNREPOURL" subrepo
+  $ svn checkout "$SVNREPOURL" subrepo | sort
   A    subrepo/proj B
   A    subrepo/proj B/mytrunk
   A    subrepo/proj B/mytrunk/letter .txt
@@ -305,7 +305,8 @@  try converting when we have an svn subre
   1 Adding file2
   0 merged
   $ cd withmerge-converted
-  $ hg up
+  $ hg up | sort
+  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   A    subrepo/proj B
   A    subrepo/proj B/mytrunk
   A    subrepo/proj B/mytrunk/letter .txt
@@ -317,7 +318,6 @@  try converting when we have an svn subre
   A    subrepo/proj B/tags/v0.2/letter .txt
   A    subrepo/proj B/tags/v0.2/letter2.txt
   Checked out revision 9.
-  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ ls
   file1.txt
   file2.txt