[PATCH stable bsd] tests: glob out 127.0.0.1 in tests
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Mon May 2 11:16:50 EDT 2016
I pruned and pushed.
On 05/02/2016 04:27 PM, Augie Fackler wrote:
>> On May 2, 2016, at 10:21, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
>>
>> Pushed on stable, thanks.
> Sorry, mpm and I talked about this in irc, and I'm going to do something a little bit more comprehensive. Please drop this for now.
>
>> On 04/22/2016 07:08 PM, Augie Fackler wrote:
>>> # HG changeset patch
>>> # User Augie Fackler <augie at google.com>
>>> # Date 1461343812 14400
>>> # Fri Apr 22 12:50:12 2016 -0400
>>> # Branch stable
>>> # Node ID 4c4455c53466a46359022b1e4f309311e192fb32
>>> # Parent 25d93c61cef4f25d80fa37219851c312e291f6c3
>>> tests: glob out 127.0.0.1 in tests
>>>
>>> FreeBSD jails might not have a dedicated loopback address at all, and
>>> even if they do it might not be numbered as 127.0.0.1. Just give up
>>> and glob out the IP entirely.
>>>
>>> diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
>>> --- a/tests/test-bundle2-exchange.t
>>> +++ b/tests/test-bundle2-exchange.t
>>> @@ -395,7 +395,7 @@ push over http
>>> remote: lock: free
>>> remote: wlock: free
>>> remote: postclose-tip:32af7686d403 public book_32af
>>> - remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:http:*: (glob)
>>> updating bookmark book_32af
>>> pre-close-tip:02de42196ebe draft book_02de
>>> postclose-tip:02de42196ebe draft book_02de
>>> diff --git a/tests/test-hgweb-raw.t b/tests/test-hgweb-raw.t
>>> --- a/tests/test-hgweb-raw.t
>>> +++ b/tests/test-hgweb-raw.t
>>> @@ -32,7 +32,7 @@ Test raw style of hgweb
>>> It is very boring to read, but computers don't
>>> care about things like that.
>>> $ cat access.log error.log
>>> - 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)
>>> + * - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)
>>> $ rm access.log error.log
>>> $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid \
>>> @@ -53,6 +53,6 @@ Test raw style of hgweb
>>> It is very boring to read, but computers don't
>>> care about things like that.
>>> $ cat access.log error.log
>>> - 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)
>>> + * - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)
>>> $ cd ..
>>> diff --git a/tests/test-hgwebdir.t b/tests/test-hgwebdir.t
>>> --- a/tests/test-hgwebdir.t
>>> +++ b/tests/test-hgwebdir.t
>>> @@ -1209,7 +1209,7 @@ test listening address/port specified by
>>> > EOF
>>> $ hg serve -d --pid-file=hg.pid --web-conf paths.conf \
>>> > -A access-paths.log -E error-paths-9.log
>>> - listening at http://*:$HGPORT1/ (bound to 127.0.0.1:$HGPORT1) (glob)
>>> + listening at http://*:$HGPORT1/ (bound to *:$HGPORT1) (glob)
>>> $ cat hg.pid >> $DAEMON_PIDS
>>> $ get-with-headers.py localhost:$HGPORT1 '?style=raw'
>>> 200 Script output follows
>>> @@ -1221,7 +1221,7 @@ test --port option overrides web.port:
>>> $ killdaemons.py
>>> $ hg serve -p $HGPORT2 -d -v --pid-file=hg.pid --web-conf paths.conf \
>>> > -A access-paths.log -E error-paths-10.log
>>> - listening at http://*:$HGPORT2/ (bound to 127.0.0.1:$HGPORT2) (glob)
>>> + listening at http://*:$HGPORT2/ (bound to *:$HGPORT2) (glob)
>>> $ cat hg.pid >> $DAEMON_PIDS
>>> $ get-with-headers.py localhost:$HGPORT2 '?style=raw'
>>> 200 Script output follows
>>> diff --git a/tests/test-push-http-bundle1.t b/tests/test-push-http-bundle1.t
>>> --- a/tests/test-push-http-bundle1.t
>>> +++ b/tests/test-push-http-bundle1.t
>>> @@ -77,7 +77,7 @@ expect success
>>> remote: adding manifests
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> - remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> % serve errors
>>> $ hg rollback
>>> repository tip rolled back to revision 0 (undo serve)
>>> @@ -93,7 +93,7 @@ expect success, server lacks the httphea
>>> remote: adding manifests
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> - remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> % serve errors
>>> $ hg rollback
>>> repository tip rolled back to revision 0 (undo serve)
>>> @@ -109,7 +109,7 @@ expect success, server lacks the unbundl
>>> remote: adding manifests
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> - remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> % serve errors
>>> $ hg rollback
>>> repository tip rolled back to revision 0 (undo serve)
>>> diff --git a/tests/test-push-http.t b/tests/test-push-http.t
>>> --- a/tests/test-push-http.t
>>> +++ b/tests/test-push-http.t
>>> @@ -68,7 +68,7 @@ expect success
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> remote: pushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
>>> - remote: changegroup hook: HG_BUNDLE2=1 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: changegroup hook: HG_BUNDLE2=1 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> % serve errors
>>> $ hg rollback
>>> repository tip rolled back to revision 0 (undo serve)
>>> @@ -85,7 +85,7 @@ expect success, server lacks the httphea
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> remote: pushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
>>> - remote: changegroup hook: HG_BUNDLE2=1 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: changegroup hook: HG_BUNDLE2=1 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> % serve errors
>>> $ hg rollback
>>> repository tip rolled back to revision 0 (undo serve)
>>> @@ -102,7 +102,7 @@ expect success, server lacks the unbundl
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> remote: pushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
>>> - remote: changegroup hook: HG_BUNDLE2=1 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: changegroup hook: HG_BUNDLE2=1 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> % serve errors
>>> $ hg rollback
>>> repository tip rolled back to revision 0 (undo serve)
>>> @@ -123,7 +123,7 @@ expect push success, phase change failur
>>> remote: adding manifests
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> - remote: prepushkey hook: HG_BUNDLE2=1 HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: prepushkey hook: HG_BUNDLE2=1 HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> remote: pushkey-abort: prepushkey hook exited with status 1
>>> remote: transaction abort!
>>> remote: rollback completed
>>> @@ -141,7 +141,7 @@ expect phase change success
>>> remote: adding manifests
>>> remote: adding file changes
>>> remote: added 1 changesets with 1 changes to 1 files
>>> - remote: prepushkey hook: HG_BUNDLE2=1 HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
>>> + remote: prepushkey hook: HG_BUNDLE2=1 HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:*: (glob)
>>> % serve errors
>>> $ hg rollback
>>> repository tip rolled back to revision 0 (undo serve)
>>> diff --git a/tests/test-serve.t b/tests/test-serve.t
>>> --- a/tests/test-serve.t
>>> +++ b/tests/test-serve.t
>>> @@ -34,13 +34,13 @@ errors
>>> With -v
>>> $ hgserve
>>> - listening at http://localhost/ (bound to 127.0.0.1:HGPORT1)
>>> + listening at http://localhost/ (bound to *:HGPORT1) (glob)
>>> % errors
>>> With -v and -p HGPORT2
>>> $ hgserve -p "$HGPORT2"
>>> - listening at http://localhost/ (bound to 127.0.0.1:HGPORT2)
>>> + listening at http://localhost/ (bound to *:HGPORT2) (glob)
>>> % errors
>>> With -v and -p daytime (should fail because low port)
>>> @@ -57,25 +57,25 @@ With -v and -p daytime (should fail beca
>>> With --prefix foo
>>> $ hgserve --prefix foo
>>> - listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
>>> + listening at http://localhost/foo/ (bound to *:HGPORT1) (glob)
>>> % errors
>>> With --prefix /foo
>>> $ hgserve --prefix /foo
>>> - listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
>>> + listening at http://localhost/foo/ (bound to *:HGPORT1) (glob)
>>> % errors
>>> With --prefix foo/
>>> $ hgserve --prefix foo/
>>> - listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
>>> + listening at http://localhost/foo/ (bound to *:HGPORT1) (glob)
>>> % errors
>>> With --prefix /foo/
>>> $ hgserve --prefix /foo/
>>> - listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
>>> + listening at http://localhost/foo/ (bound to *:HGPORT1) (glob)
>>> % errors
>>> $ cd ..
>>> _______________________________________________
>>> Mercurial-devel mailing list
>>> Mercurial-devel at mercurial-scm.org
>>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list