Patchwork [8,of,8] test-largefiles-update: conditionalize output instead of tests

login
register
mail settings
Submitter Matt Harbison
Date July 9, 2017, 1:11 a.m.
Message ID <bf71c0a951b008e14673.1499562666@Envy>
Download mbox | patch
Permalink /patch/22151/
State Accepted
Headers show

Comments

Matt Harbison - July 9, 2017, 1:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1499554070 14400
#      Sat Jul 08 18:47:50 2017 -0400
# Node ID bf71c0a951b008e1467355161aa9d26845fa14d2
# Parent  93e1887cc1628dcede2e7516432e19b0180784db
test-largefiles-update: conditionalize output instead of tests
Augie Fackler - July 9, 2017, 1:34 a.m.
On Sat, Jul 08, 2017 at 09:11:06PM -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1499554070 14400
> #      Sat Jul 08 18:47:50 2017 -0400
> # Node ID bf71c0a951b008e1467355161aa9d26845fa14d2
> # Parent  93e1887cc1628dcede2e7516432e19b0180784db
> test-largefiles-update: conditionalize output instead of tests

queued, thanks

Patch

diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -214,13 +214,11 @@ 
   $ hg commit -m 'will be rollback-ed soon'
   $ echo largeY > largeY
   $ hg add --large largeY
-#if windows
+
   $ hg status -A large1
-  large1: * (glob)
-#else
-  $ hg status -A large1
-  large1: No such file or directory
-#endif
+  large1: The system cannot find the file specified (windows !)
+  large1: No such file or directory (no-windows !)
+
   $ hg status -A large2
   ? large2
   $ hg status -A largeX
@@ -309,39 +307,33 @@ 
   $ hg rebase -s 1 -d 2 --keep
   rebasing 1:72518492caa6 "#1"
   rebasing 4:07d6153b5c04 "#4" (tip)
-#if windows
+
   $ hg status -A large1
-  large1: * (glob)
-#else
-  $ hg status -A large1
-  large1: No such file or directory
-#endif
+  large1: The system cannot find the file specified (windows !)
+  large1: No such file or directory (no-windows !)
+
   $ hg status -A largeX
   C largeX
   $ hg strip -q 5
 
   $ hg update -q -C 2
   $ hg transplant -q 1 4
-#if windows
+
   $ hg status -A large1
-  large1: * (glob)
-#else
-  $ hg status -A large1
-  large1: No such file or directory
-#endif
+  large1: The system cannot find the file specified (windows !)
+  large1: No such file or directory (no-windows !)
+
   $ hg status -A largeX
   C largeX
   $ hg strip -q 5
 
   $ hg update -q -C 2
   $ hg transplant -q --merge 1 --merge 4
-#if windows
+
   $ hg status -A large1
-  large1: * (glob)
-#else
-  $ hg status -A large1
-  large1: No such file or directory
-#endif
+  large1: The system cannot find the file specified (windows !)
+  large1: No such file or directory (no-windows !)
+
   $ hg status -A largeX
   C largeX
   $ hg strip -q 5