Patchwork [2,of,2] tests: handle differences between missing file error strings on Windows and Unix

login
register
mail settings
Submitter Matt Harbison
Date Nov. 19, 2014, 5:05 a.m.
Message ID <2cfd7aa5b366f6a02aab.1416373504@Envy>
Download mbox | patch
Permalink /patch/6787/
State Accepted
Commit c2907334276b5cc6c468661ff12dc8a78653b766
Headers show

Comments

Matt Harbison - Nov. 19, 2014, 5:05 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1416372718 18000
#      Tue Nov 18 23:51:58 2014 -0500
# Node ID 2cfd7aa5b366f6a02aab040ab4e92cbb3130c040
# Parent  c7f4ddbf7c2b8ab3eac36ed65808c5c4e7d5c5a3
tests: handle differences between missing file error strings on Windows and Unix
Matt Mackall - Nov. 19, 2014, 3:49 p.m.
On Wed, 2014-11-19 at 00:05 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1416372718 18000
> #      Tue Nov 18 23:51:58 2014 -0500
> # Node ID 2cfd7aa5b366f6a02aab040ab4e92cbb3130c040
> # Parent  c7f4ddbf7c2b8ab3eac36ed65808c5c4e7d5c5a3
> tests: handle differences between missing file error strings on Windows and Unix

These are queued for default, thanks.
Augie Fackler - Nov. 25, 2014, 3:41 p.m.
On Wed, Nov 19, 2014 at 12:05:04AM -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1416372718 18000
> #      Tue Nov 18 23:51:58 2014 -0500
> # Node ID 2cfd7aa5b366f6a02aab040ab4e92cbb3130c040
> # Parent  c7f4ddbf7c2b8ab3eac36ed65808c5c4e7d5c5a3
> tests: handle differences between missing file error strings on Windows and Unix

These patches were pushed as 5bd04faaa3ee and c2907334276b. Thanks!

(I didn't see any other mail about this, but I could just be failing at email.)

>
> diff --git a/tests/test-status-rev.t b/tests/test-status-rev.t
> --- a/tests/test-status-rev.t
> +++ b/tests/test-status-rev.t
> @@ -81,8 +81,13 @@
>    $ hg status -A --rev 1 'glob:missing_*_missing-tracked'
>    ! missing_content2_missing-tracked
>    ! missing_missing_missing-tracked
> +#if windows
> +  $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
> +  missing_missing_missing-untracked: The system cannot find the file specified
> +#else
>    $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
>    missing_missing_missing-untracked: No such file or directory
> +#endif
>
>  Status between first and second commit. Should ignore dirstate status.
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
Olle Lundberg - Nov. 25, 2014, 10:23 p.m.
On Tue, Nov 25, 2014 at 4:41 PM, Augie Fackler <raf@durin42.com> wrote:

> On Wed, Nov 19, 2014 at 12:05:04AM -0500, Matt Harbison wrote:
> > # HG changeset patch
> > # User Matt Harbison <matt_harbison@yahoo.com>
> > # Date 1416372718 18000
> > #      Tue Nov 18 23:51:58 2014 -0500
> > # Node ID 2cfd7aa5b366f6a02aab040ab4e92cbb3130c040
> > # Parent  c7f4ddbf7c2b8ab3eac36ed65808c5c4e7d5c5a3
> > tests: handle differences between missing file error strings on Windows
> and Unix
>
> These patches were pushed as 5bd04faaa3ee and c2907334276b. Thanks!
>
> (I didn't see any other mail about this, but I could just be failing at
> email.)
>
mpm already queued it:
http://patchwork.serpentine.com/patch/6787/


>
> >
> > diff --git a/tests/test-status-rev.t b/tests/test-status-rev.t
> > --- a/tests/test-status-rev.t
> > +++ b/tests/test-status-rev.t
> > @@ -81,8 +81,13 @@
> >    $ hg status -A --rev 1 'glob:missing_*_missing-tracked'
> >    ! missing_content2_missing-tracked
> >    ! missing_missing_missing-tracked
> > +#if windows
> > +  $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
> > +  missing_missing_missing-untracked: The system cannot find the file
> specified
> > +#else
> >    $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
> >    missing_missing_missing-untracked: No such file or directory
> > +#endif
> >
> >  Status between first and second commit. Should ignore dirstate status.
> >
> > _______________________________________________
> > 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-status-rev.t b/tests/test-status-rev.t
--- a/tests/test-status-rev.t
+++ b/tests/test-status-rev.t
@@ -81,8 +81,13 @@ 
   $ hg status -A --rev 1 'glob:missing_*_missing-tracked'
   ! missing_content2_missing-tracked
   ! missing_missing_missing-tracked
+#if windows
+  $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
+  missing_missing_missing-untracked: The system cannot find the file specified
+#else
   $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
   missing_missing_missing-untracked: No such file or directory
+#endif
 
 Status between first and second commit. Should ignore dirstate status.