Patchwork D7816: tests: stabilize test-subrepo-svn.t on Windows

login
register
mail settings
Submitter phabricator
Date Jan. 16, 2020, 4:32 p.m.
Message ID <a8fe2f3a6589adf90851f5d9bebd38fd@localhost.localdomain>
Download mbox | patch
Permalink /patch/44446/
State Not Applicable
Headers show

Comments

phabricator - Jan. 16, 2020, 4:32 p.m.
Closed by commit rHGe598c874b4af: tests: stabilize test-subrepo-svn.t on Windows (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7816?vs=19269&id=19375

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7816/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7816

AFFECTED FILES
  tests/test-subrepo-svn.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -87,10 +87,12 @@ 
 
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
 
 change file in svn and hg, commit
@@ -113,10 +115,12 @@ 
   At revision 3.
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 3
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
 
 missing svn file, commit should fail
@@ -235,10 +239,12 @@ 
 
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 3
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file:/*/svn-repo/src (glob) (windows !)
+   source   file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !)
    revision 2
 
 verify subrepo is contained within the repo directory
@@ -574,8 +580,8 @@ 
 Test forgetting files, not implemented in svn subrepo, used to
 traceback
 
-  $ hg forget 'notafile*'
-  notafile*: $ENOENT$
+  $ hg forget 'notafile'
+  notafile: $ENOENT$
   [1]
 
 Test a subrepo referencing a just moved svn path. Last commit rev will