Patchwork test-fileset.t: remove 'bar ' and 'baz\' from tested filenames

login
register
mail settings
Submitter Siddharth Agarwal
Date March 23, 2015, 2:19 a.m.
Message ID <38d144a1f12177d6ca4d.1427077191@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/8219/
State Superseded
Headers show

Comments

Siddharth Agarwal - March 23, 2015, 2:19 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1427077156 25200
#      Sun Mar 22 19:19:16 2015 -0700
# Node ID 38d144a1f12177d6ca4d2ca3bb802536d8660cb7
# Parent  1cfded2fa1a92ee9b55d1f62675569e340a39083
test-fileset.t: remove 'bar ' and 'baz\' from tested filenames

This test is guarded by a '#if no-windows', but they can't be written out on
vfat on Linux either. con.xml can, and for testing that's good enough.

Also clean up a stray 'ls' that I mistakenly left in while writing the test.
Matt Harbison - March 23, 2015, 4:07 a.m.
On Sun, 22 Mar 2015 22:19:51 -0400, Siddharth Agarwal <sid0@fb.com> wrote:

> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1427077156 25200
> #      Sun Mar 22 19:19:16 2015 -0700
> # Node ID 38d144a1f12177d6ca4d2ca3bb802536d8660cb7
> # Parent  1cfded2fa1a92ee9b55d1f62675569e340a39083
> test-fileset.t: remove 'bar ' and 'baz\' from tested filenames

This conflicts with something Pierre-Yves queued over the weekend (the  
forgets I added will need to be fixed up too).

http://www.selenic.com/pipermail/mercurial-devel/2015-March/067574.html

> @@ -271,8 +254,6 @@
>    a1
>    b1
>    b2
> -  bar
> -  baz\
>    c1
>    con.xml
>    mixed
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
Siddharth Agarwal - March 23, 2015, 3:50 p.m.
On 03/22/2015 09:07 PM, Matt Harbison wrote:
> On Sun, 22 Mar 2015 22:19:51 -0400, Siddharth Agarwal <sid0@fb.com>
> wrote:
>
>> # HG changeset patch
>> # User Siddharth Agarwal <sid0@fb.com>
>> # Date 1427077156 25200
>> #      Sun Mar 22 19:19:16 2015 -0700
>> # Node ID 38d144a1f12177d6ca4d2ca3bb802536d8660cb7
>> # Parent  1cfded2fa1a92ee9b55d1f62675569e340a39083
>> test-fileset.t: remove 'bar ' and 'baz\' from tested filenames
>
> This conflicts with something Pierre-Yves queued over the weekend (the
> forgets I added will need to be fixed up too).

Thanks -- yeah. I'll wait for Matt to push that before sending an
updated version of the vfat fix.

>
> http://www.selenic.com/pipermail/mercurial-devel/2015-March/067574.html
>
>> @@ -271,8 +254,6 @@
>>    a1
>>    b1
>>    b2
>> -  bar
>> -  baz\
>>    c1
>>    con.xml
>>    mixed
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@selenic.com
>> http://selenic.com/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -113,24 +113,9 @@ 
 
 #if no-windows
   $ echo foo > con.xml
-  $ echo bar > 'bar '
-  $ echo baz > 'baz\'
-  $ ls
-  b1
-  b2
-  b2link
-  bar 
-  baz\
-  bin
-  c1
-  c2
-  c3
+  $ fileset 'not portable()'
   con.xml
-  $ fileset 'not portable()'
-  bar 
-  baz\
-  con.xml
-  $ hg --config ui.portablefilenames=ignore add con.xml 'bar ' 'baz\'
+  $ hg --config ui.portablefilenames=ignore add con.xml
 #endif
 
   >>> file('1k', 'wb').write(' '*1024)
@@ -244,8 +229,6 @@ 
 
 #if no-windows
   $ fileset -r1 'not portable()'
-  bar 
-  baz\
   con.xml
 #endif
 
@@ -271,8 +254,6 @@ 
   a1
   b1
   b2
-  bar 
-  baz\
   c1
   con.xml
   mixed