changeset 33344:1e872b08a4e9

test-largefiles-update: conditionalize output instead of tests
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 08 Jul 2017 18:47:50 -0400
parents 305935be8d5c
children 4192694b4844
files tests/test-largefiles-update.t
diffstat 1 files changed, 16 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-largefiles-update.t	Sat Jul 08 18:46:43 2017 -0400
+++ b/tests/test-largefiles-update.t	Sat Jul 08 18:47:50 2017 -0400
@@ -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