Patchwork tests: lines with largefile .* file://$TESTTMP also match on windows

login
register
mail settings
Submitter Simon Heimberg
Date Feb. 10, 2014, 5:09 p.m.
Message ID <ce3623bb9edf23c18b74.1392052189@lapsi.heimberg.home>
Download mbox | patch
Permalink /patch/3543/
State Accepted
Commit ea005e754c9cbc7881ca045b7d14fdc31df1c302
Headers show

Comments

Simon Heimberg - Feb. 10, 2014, 5:09 p.m.
# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1390855165 -3600
# Node ID ce3623bb9edf23c18b74a26835fe59c779e799da
# Parent  98eadbfffa0e987eaa9b24bcc92357be1bd252d5
tests: lines with largefile .* file://$TESTTMP also match on windows

on windows, largefile paths are written as "file:///C:/temp/...", corresponding
to "file:///$TESTTMP/..." (all three slashes shown).
But on posix systems they are written as "file:///tmp/..." corresponding to
"file://$TESTTMP/..." (only two slashes shown).

Write the glob "file:/*/" to match both versions.
Matt Mackall - Feb. 12, 2014, 3:41 p.m.
On Mon, 2014-02-10 at 18:09 +0100, Simon Heimberg wrote:
> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1390855165 -3600
> # Node ID ce3623bb9edf23c18b74a26835fe59c779e799da
> # Parent  98eadbfffa0e987eaa9b24bcc92357be1bd252d5
> tests: lines with largefile .* file://$TESTTMP also match on windows

Queued for default, thanks.

Patch

diff -r 98eadbfffa0e -r ce3623bb9edf contrib/check-code.py
--- a/contrib/check-code.py	Son Feb 09 18:36:37 2014 -0600
+++ b/contrib/check-code.py	Mon Jan 27 21:39:25 2014 +0100
@@ -162,6 +162,8 @@ 
     (r'^  moving \S+/.*[^)]$', winglobmsg),
     (r'^  no changes made to subrepo since.*/.*[^)]$', winglobmsg),
     (r'^  .*: largefile \S+ not available from file:.*/.*[^)]$', winglobmsg),
+    (r'^  .*file://\$TESTTMP',
+     'write "file:/*/$TESTTMP" + (glob) to match on windows too'),
   ],
   # warnings
   [
diff -r 98eadbfffa0e -r ce3623bb9edf tests/test-largefiles-cache.t
--- a/tests/test-largefiles-cache.t	Son Feb 09 18:36:37 2014 -0600
+++ b/tests/test-largefiles-cache.t	Mon Jan 27 21:39:25 2014 +0100
@@ -47,7 +47,7 @@ 
 
   $ hg update -r0
   getting changed largefiles
-  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file://$TESTTMP/mirror (glob)
+  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:/*/$TESTTMP/mirror (glob)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status
@@ -64,7 +64,7 @@ 
 
   $ hg update -r0
   getting changed largefiles
-  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file://$TESTTMP/mirror (glob)
+  large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:/*/$TESTTMP/mirror (glob)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status
diff -r 98eadbfffa0e -r ce3623bb9edf tests/test-largefiles.t
--- a/tests/test-largefiles.t	Son Feb 09 18:36:37 2014 -0600
+++ b/tests/test-largefiles.t	Mon Jan 27 21:39:25 2014 +0100
@@ -1280,7 +1280,7 @@ 
   $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
   $ hg up -r 6
   getting changed largefiles
-  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob)
+  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
   1 largefiles updated, 2 removed
   4 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ rm normal3
@@ -1301,7 +1301,7 @@ 
   ! normal3
   $ hg up -Cr.
   getting changed largefiles
-  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob)
+  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
@@ -1323,7 +1323,7 @@ 
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   getting changed largefiles
-  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob)
+  large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
   1 largefiles updated, 0 removed
 
   $ hg rollback -q
diff -r 98eadbfffa0e -r ce3623bb9edf tests/test-lfconvert.t
--- a/tests/test-lfconvert.t	Son Feb 09 18:36:37 2014 -0600
+++ b/tests/test-lfconvert.t	Mon Jan 27 21:39:25 2014 +0100
@@ -342,7 +342,7 @@ 
   $ rm largefiles-repo/.hg/largefiles/*
   $ hg lfconvert --to-normal issue3519 normalized3519
   initializing destination normalized3519
-  large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file://$TESTTMP/largefiles-repo (glob)
+  large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:/*/$TESTTMP/largefiles-repo (glob)
   abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
   [255]