[PATCH] test-bookmarks-pushpull: adapt for Windows

[Mads Kiilerich]

Adrian Buehlmann wrote, On 06/20/2012 06:08 PM:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1340208121 -7200
> # Node ID 1902f971095a6edebaf1f6a4b21fe384855717cb
> # Parent  0f10d03fb052fd960e08e0f61496241ddb268268
> test-bookmarks-pushpull: adapt for Windows

Pushed to crew with minor adjustments, thanks.

> The kill call at the end is redundant, as we already have
>
> 199:  $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log
> 200:  $ cat ../hg.pid >> $DAEMON_PIDS
>
> So there is nothing left that would not already be killed by the $DAEMON_PIDS
> mechanism.

- even though this doesn't have much to do with the subject line.

/Mads

> diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
> --- a/tests/test-bookmarks-pushpull.t
> +++ b/tests/test-bookmarks-pushpull.t
> @@ -121,7 +121,7 @@
>        foobar                    1:9b140be10808
>   
>     $ hg pull --config paths.foo=../a foo
> -  pulling from $TESTTMP/a
> +  pulling from $TESTTMP/a (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -251,6 +251,4 @@
>        foo                       -1:000000000000
>        foobar                    1:9b140be10808
>   
> -  $ kill `cat ../hg.pid`
> -
>     $ cd ..
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel