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

login
register
mail settings
Submitter Siddharth Agarwal
Date March 24, 2015, 2:01 a.m.
Message ID <02e599ed48e707425797.1427162505@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/8230/
State Accepted
Commit 98d9d33dfd9571d7ec7d5fb014e52eb70d3dc0fd
Headers show

Comments

Siddharth Agarwal - March 24, 2015, 2:01 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1427077156 25200
#      Sun Mar 22 19:19:16 2015 -0700
# Node ID 02e599ed48e7074257972439e38bef11b8fe1ed8
# Parent  811a1842cfe5f632145912d9bf2dc859e6ee3eeb
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 Mackall - March 24, 2015, 2:31 p.m.
On Mon, 2015-03-23 at 19:01 -0700, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1427077156 25200
> #      Sun Mar 22 19:19:16 2015 -0700
> # Node ID 02e599ed48e7074257972439e38bef11b8fe1ed8
> # Parent  811a1842cfe5f632145912d9bf2dc859e6ee3eeb
> test-fileset.t: remove 'bar ' and 'baz\' from tested filenames

Queued for default, thanks. For future reference, the original test
probably wanted to be guarded by unix-permissions, which is false on
VFAT.
Siddharth Agarwal - March 24, 2015, 4:29 p.m.
On 03/24/2015 07:31 AM, Matt Mackall wrote:
> Queued for default, thanks. For future reference, the original test
> probably wanted to be guarded by unix-permissions, which is false on
> VFAT.

Aha, thanks. I was looking for that but couldn't find it.

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,11 +229,7 @@ 
 
 #if no-windows
   $ fileset -r1 'not portable()'
-  bar 
-  baz\
   con.xml
-  $ hg forget 'bar '
-  $ hg forget 'baz\'
   $ hg forget 'con.xml'
 #endif