Patchwork [5,of,5] test-remove: drop a useless Windows specific conditional

login
register
mail settings
Submitter Matt Harbison
Date April 12, 2016, 4:55 a.m.
Message ID <cc387cb85c9979bc1667.1460436921@Envy>
Download mbox | patch
Permalink /patch/14542/
State Accepted
Headers show

Comments

Matt Harbison - April 12, 2016, 4:55 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1460435642 14400
#      Tue Apr 12 00:34:02 2016 -0400
# Node ID cc387cb85c9979bc1667a9dad3e1d12c367c1419
# Parent  c70c025cf784f81c961cb79a920cfbfce0478b34
test-remove: drop a useless Windows specific conditional

The Windows branch didn't pick up the 'deleting' progress bar addition from
62e73d42bd14.  But since the Windows branch already globbed the error message,
let's just drop the other branch.
Pierre-Yves David - April 13, 2016, 8:01 a.m.
On 04/11/2016 09:55 PM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1460435642 14400
> #      Tue Apr 12 00:34:02 2016 -0400
> # Node ID cc387cb85c9979bc1667a9dad3e1d12c367c1419
> # Parent  c70c025cf784f81c961cb79a920cfbfce0478b34
> test-remove: drop a useless Windows specific conditional
>
> The Windows branch didn't pick up the 'deleting' progress bar addition from
> 62e73d42bd14.  But since the Windows branch already globbed the error message,
> let's just drop the other branch.

Pushed, thanks.

(abstract question, does this new windows 10 think will help us having a 
windows test box we can easily all ssh too)?
Matt Harbison - April 14, 2016, 12:37 a.m.
On Wed, 13 Apr 2016 04:01:54 -0400, Pierre-Yves David  
<pierre-yves.david@ens-lyon.org> wrote:

>
>
> On 04/11/2016 09:55 PM, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison <matt_harbison@yahoo.com>
>> # Date 1460435642 14400
>> #      Tue Apr 12 00:34:02 2016 -0400
>> # Node ID cc387cb85c9979bc1667a9dad3e1d12c367c1419
>> # Parent  c70c025cf784f81c961cb79a920cfbfce0478b34
>> test-remove: drop a useless Windows specific conditional
>>
>> The Windows branch didn't pick up the 'deleting' progress bar addition  
>> from
>> 62e73d42bd14.  But since the Windows branch already globbed the error  
>> message,
>> let's just drop the other branch.
>
> Pushed, thanks.
>
> (abstract question, does this new windows 10 think will help us having a  
> windows test box we can easily all ssh too)?
>

No idea, I've been doing my best to avoid it.  But it would be nice to  
have a Windows test box, since there are still a few more (harmless?)  
failures that snuck in this cycle.

What is the concern/issue with running an ssh server on Windows 7 or  
whatever?  Obviously it would be a 3rd party package, but there seem to be  
more than a couple.  I don't have any experience with any of them.

Patch

diff --git a/tests/test-remove.t b/tests/test-remove.t
--- a/tests/test-remove.t
+++ b/tests/test-remove.t
@@ -468,15 +468,10 @@ 
   \r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   removing d1/a (glob)
-#if windows
+
   $ hg rm --after nosuch
   nosuch: * (glob)
-  [1]
-#else
-  $ hg rm --after nosuch
-  nosuch: No such file or directory
   \r (no-eol) (esc)
   deleting [===========================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   [1]
-#endif