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

login
register
mail settings
Submitter phabricator
Date Jan. 9, 2020, 1:28 a.m.
Message ID <differential-rev-PHID-DREV-k7qzqmlay3q62l2et7x3-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44222/
State Superseded
Headers show

Comments

phabricator - Jan. 9, 2020, 1:28 a.m.
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This partially reverts 991e4404e910 <https://phab.mercurial-scm.org/rHG991e4404e910e4fc420ae5ee25dc1872b1f23577>, because the URL form of `C:\...` gets
  escaped to `C%3A/...`, which breaks the substitution of $TESTTMP.
  
  The forget command on 'notafile*' errored out with:
  
    notafile*: The filename, directory name, or volume label syntax is incorrect
  
  which I think is because '*' isn't a legal character in a file name (though I
  can't trigger this directly from MSYS or cmd.exe for some reason).

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-subrepo-svn.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-devel
phabricator - Jan. 14, 2020, 3:57 p.m.
pulkit added a comment.


  The test mow fails on linux.
  
    --- /home/pulkit/repo/hgpush/tests/test-subrepo-svn.t
    +++ /home/pulkit/repo/hgpush/tests/test-subrepo-svn.t.err
    @@ -87,10 +87,10 @@
                    
       $ hg debugsub                         
       path s                                        
    -   source   file://*/svn-repo/src (glob)
    +   source   file:/*/$TESTTMP/svn-repo/src (glob)
        revision 2                       
       path subdir/s     
    -   source   file://*/svn-repo/src (glob)
    +   source   file:/*/$TESTTMP/svn-repo/src (glob)
        revision 2
                                             
     change file in svn and hg, commit               
    @@ -113,10 +113,10 @@
       At revision 3.
       $ hg debugsub                         
       path s                                        
    -   source   file://*/svn-repo/src (glob)
    +   source   file:/*/$TESTTMP/svn-repo/src (glob)
        revision 3                                        
       path subdir/s
    -   source   file://*/svn-repo/src (glob)
    +   source   file:/*/$TESTTMP/svn-repo/src (glob)                                                              
        revision 2
    
     missing svn file, commit should fail
    @@ -235,10 +235,10 @@
    
       $ hg debugsub
       path s
    -   source   file://*/svn-repo/src (glob)
    +   source   file:/*/$TESTTMP/svn-repo/src (glob)
        revision 3
       path subdir/s
    -   source   file://*/svn-repo/src (glob)
    +   source   file:/*/$TESTTMP/svn-repo/src (glob)
        revision 2
    
     verify subrepo is contained within the repo directory
    
    ERROR: test-subrepo-svn.t output changed

REPOSITORY
  rHG Mercurial

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

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

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,10 @@ 
 
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file://*/svn-repo/src (glob)
    revision 2
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file://*/svn-repo/src (glob)
    revision 2
 
 change file in svn and hg, commit
@@ -113,10 +113,10 @@ 
   At revision 3.
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file://*/svn-repo/src (glob)
    revision 3
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file://*/svn-repo/src (glob)
    revision 2
 
 missing svn file, commit should fail
@@ -235,10 +235,10 @@ 
 
   $ hg debugsub
   path s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file://*/svn-repo/src (glob)
    revision 3
   path subdir/s
-   source   file:/*/$TESTTMP/svn-repo/src (glob)
+   source   file://*/svn-repo/src (glob)
    revision 2
 
 verify subrepo is contained within the repo directory
@@ -574,8 +574,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