[PATCH 3 of 3] tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup

Adrian Buehlmann adrian at cadifra.com
Sat Oct 13 01:49:05 CDT 2012


On 2012-10-10 01:41, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <mads at kiilerich.com>
> # Date 1349825874 -7200
> # Node ID 9aa7a6a4ad367a48d7efe347cd0925325d278c54
> # Parent  2d3adfec4624db760777ac23c003f3a9b335aa5b
> tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup

I haven't followed closely enough what you are doing here (sorry). Just in case
you haven't seen it, this seems to fail on Windows with (just don't update past
the unrelated 76b73ce0ffac fchmod bug):

  $ PATH="/mingw/bin:/bin:`pwd`/..:/c/python" python run-tests.py --local test-subrepo-recursion.t

  --- C:\Users\adi\hgrepos\hg-main\tests\test-subrepo-recursion.t
  +++ C:\Users\adi\hgrepos\hg-main\tests\test-subrepo-recursion.t.err
  @@ -282,10 +282,10 @@
     archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
                                                                 \r (no-eol) (esc)
     \r (no-eol) (esc)
  -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
  -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
  -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
  -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
                                                                 \r (no-eol) (esc)
     $ find ../archive | sort
     ../archive
  @@ -324,10 +324,10 @@
     archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
                                                                 \r (no-eol) (esc)
     \r (no-eol) (esc)
  -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
  -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
  -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
  -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
                                                                 \r (no-eol) (esc)

   Test archiving a revision that references a subrepo that is not yet
  @@ -357,10 +357,10 @@
     archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
                                                                 \r (no-eol) (esc)
     \r (no-eol) (esc)
  -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
  -  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
  -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
  -  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [                                 ] 0/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
  +  archiving (foo\\bar) [================================>] 1/1\r (no-eol) (esc)
                                                                 \r (no-eol) (esc)
     cloning subrepo foo from $TESTTMP/repo/foo
     cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)

  ERROR: C:\Users\adi\hgrepos\hg-main\tests\test-subrepo-recursion.t output changed
  !
  Failed test-subrepo-recursion.t: output changed
  # Ran 1 tests, 0 skipped, 1 failed.


More information about the Mercurial-devel mailing list