| Submitter | Matt Harbison |
|---|---|
| Date | July 19, 2017, 2:16 a.m. |
| Message ID | <51f4e9087c4cb755338c.1500430607@Envy> |
| Download | mbox | patch |
| Permalink | /patch/22519/ |
| State | Accepted |
| Headers | show |
Comments
On Tue, 18 Jul 2017 22:16:47 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1500421791 14400 > # Tue Jul 18 19:49:51 2017 -0400 > # Node ID 51f4e9087c4cb755338c564dba33f188e66663d1 > # Parent 9a944e908ecf9ac3aabf30a24406513370eeebe7 > test-https: properly conditionalize Windows vs non-Windows output We're close to freeze, but these patches are a kind of bug fixes, so it's probably okay to slip into the rc release. Queued, thanks.
On Wed, 19 Jul 2017 21:54:05 +0900, Yuya Nishihara wrote: > On Tue, 18 Jul 2017 22:16:47 -0400, Matt Harbison wrote: > > # HG changeset patch > > # User Matt Harbison <matt_harbison@yahoo.com> > > # Date 1500421791 14400 > > # Tue Jul 18 19:49:51 2017 -0400 > > # Node ID 51f4e9087c4cb755338c564dba33f188e66663d1 > > # Parent 9a944e908ecf9ac3aabf30a24406513370eeebe7 > > test-https: properly conditionalize Windows vs non-Windows output > > We're close to freeze, but these patches are a kind of bug fixes, so it's > probably okay to slip into the rc release. Queued, thanks. Well, it was a bit late. I've taken the patch 1 and 4 for stable.
On Wed, 19 Jul 2017 22:30:28 +0900, Yuya Nishihara wrote: > On Wed, 19 Jul 2017 21:54:05 +0900, Yuya Nishihara wrote: > > On Tue, 18 Jul 2017 22:16:47 -0400, Matt Harbison wrote: > > > # HG changeset patch > > > # User Matt Harbison <matt_harbison@yahoo.com> > > > # Date 1500421791 14400 > > > # Tue Jul 18 19:49:51 2017 -0400 > > > # Node ID 51f4e9087c4cb755338c564dba33f188e66663d1 > > > # Parent 9a944e908ecf9ac3aabf30a24406513370eeebe7 > > > test-https: properly conditionalize Windows vs non-Windows output > > > > We're close to freeze, but these patches are a kind of bug fixes, so it's > > probably okay to slip into the rc release. Queued, thanks. > > Well, it was a bit late. I've taken the patch 1 and 4 for stable. Queued 2 and 3 for default.
Patch
diff --git a/tests/test-https.t b/tests/test-https.t --- a/tests/test-https.t +++ b/tests/test-https.t @@ -605,14 +605,12 @@ $ hg serve -p $HGPORT --certificate=/missing/certificate \ > --config devel.servercafile=$PRIV --config devel.serverrequirecert=true - abort: referenced certificate file (*/missing/certificate) does not exist (glob) (windows !) - abort: referenced certificate file (/missing/certificate) does not exist (no-windows !) + abort: referenced certificate file (*/missing/certificate) does not exist (glob) [255] $ hg serve -p $HGPORT --certificate=$PRIV \ > --config devel.servercafile=/missing/cafile --config devel.serverrequirecert=true - abort: referenced certificate file (*/missing/cafile) does not exist (glob) (windows !) - abort: referenced certificate file (/missing/cafile) does not exist (no-windows !) + abort: referenced certificate file (*/missing/cafile) does not exist (glob) [255] Start hgweb that requires client certificates: @@ -657,14 +655,12 @@ Missing certficate and key files result in error $ hg id https://localhost:$HGPORT/ --config auth.l.cert=/missing/cert - abort: certificate file (*/missing/cert) does not exist; cannot connect to localhost (glob) (windows !) - abort: certificate file (/missing/cert) does not exist; cannot connect to localhost (no-windows !) + abort: certificate file (*/missing/cert) does not exist; cannot connect to localhost (glob) (restore missing file or fix references in Mercurial config) [255] $ hg id https://localhost:$HGPORT/ --config auth.l.key=/missing/key - abort: certificate file (*/missing/key) does not exist; cannot connect to localhost (glob) (windows !) - abort: certificate file (/missing/key) does not exist; cannot connect to localhost (no-windows !) + abort: certificate file (*/missing/key) does not exist; cannot connect to localhost (glob) (restore missing file or fix references in Mercurial config) [255]