Mercurial > hg
view tests/test-nointerrupt.t @ 49277:51b07ac1991c stable
url: raise error if CONNECT request to proxy was unsuccessful
The deleted code didn’t work on Python 3. On Python 2 (or Python 3 after
adapting it), the function returned in the error case. The subsequent creation
of SSL socket fails during handshake with a nonsense error.
Instead, the user should get an error of what went wrong.
I don’t see how the deleted code would be useful in the error case. The new
code is also closer of what the standard library is doing nowadays that it has
proxy support (which we don’t use in the moment).
In the test, I use port 0 because all the HGPORTs were already taken. In
practice, there should not be any server listening on port 0.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Sat, 04 Jun 2022 02:39:38 +0200 |
parents | 8c34edb1ad10 |
children | 8c75ae3f0eea |
line wrap: on
line source
#require no-windows no-rhg XXX-RHG this test hangs if `hg` is really `rhg`. This was hidden by the use of `alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed buggy. This need to be resolved sooner than later. Dummy extension simulating unsafe long running command $ SYNC_FILE="$TESTTMP/sync-file" $ export SYNC_FILE $ DONE_FILE="$TESTTMP/done-file" $ export DONE_FILE $ $ cat > wait_ext.py <<EOF > import os > import time > > from mercurial.i18n import _ > from mercurial import registrar > from mercurial import testing > > cmdtable = {} > command = registrar.command(cmdtable) > > @command(b'wait-signal', [], _(b'SYNC_FILE DONE_FILE'), norepo=True) > def sleep(ui, sync_file=b"$SYNC_FILE", done_file=b"$DONE_FILE", **opts): > start = time.time() > with ui.uninterruptible(): > testing.write_file(sync_file, b'%d' % os.getpid()) > testing.wait_file(done_file) > # make sure we get rescheduled and the signal get a chance to be handled > time.sleep(0.1) > ui.warn(b"end of unsafe operation\n") > ui.warn(b"%d second(s) passed\n" % int(time.time() - start)) > EOF $ cat > send-signal.sh << EOF > #!/bin/sh > SIG=\$1 > if [ -z "\$SIG" ]; then > echo "send-signal.sh requires one argument" >&2 > exit 1 > fi > "$RUNTESTDIR/testlib/wait-on-file" 10 "$SYNC_FILE" || exit 2 > kill -s \$SIG \`cat "$SYNC_FILE"\` > sleep 1 > touch "$DONE_FILE" > EOF #if no-windows $ chmod +x send-signal.sh #endif Kludge to emulate timeout(1) which is not generally available. Set up repository $ hg init repo $ cd repo $ cat >> $HGRCPATH << EOF > [extensions] > wait_ext = $TESTTMP/wait_ext.py > EOF Test ctrl-c $ rm -f $SYNC_FILE $DONE_FILE $ sh -c "../send-signal.sh INT" & $ hg wait-signal interrupted! [255] $ cat >> $HGRCPATH << EOF > [experimental] > nointerrupt = yes > EOF $ rm -f $SYNC_FILE $DONE_FILE $ sh -c "../send-signal.sh INT" & $ hg wait-signal interrupted! [255] $ cat >> $HGRCPATH << EOF > [experimental] > nointerrupt-interactiveonly = False > EOF $ rm -f $SYNC_FILE $DONE_FILE $ sh -c "../send-signal.sh INT" & $ hg wait-signal shutting down cleanly press ^C again to terminate immediately (dangerous) end of unsafe operation interrupted! [255]