Fix regression tests #3863

pull gavinandresen wants to merge 1 commits into bitcoin:master from gavinandresen:regtest_fixes changing 8 files +31 −18

gavinandresen commented at 11:41 PM on March 13, 2014: contributor

Taught bitcoind to close the HTTP connection after it gets a 'stop' command, to make it easier for the regression tests to cleanly stop. Move bitcoinrpc files to correct location. Tidied up the python-based regression tests.

Fix regression tests

Taught bitcoind to close the HTTP connection after it gets a 'stop' command,
to make it easier for the regression tests to cleanly stop.
Move bitcoinrpc files to correct location.
Tidied up the python-based regression tests.

5e090313ea

in src/rpcserver.cpp:None in 09a63f6808 outdated
```
 789 | @@ -790,6 +790,10 @@ void ServiceConnection(AcceptedConnection *conn)
 790 |                  // Send reply
 791 |                  strReply = JSONRPCReply(result, Value::null, jreq.id);
 792 |  
 793 | +                // Special case: "stop" closes connection
```
laanwj commented at 2:14 AM on March 14, 2014:

When the process stops, all RPC connections should close too, right?

Or does currently "stop" keeps the RPC connection open forever and prevents bitcoin from shutting down?

gavinandresen commented at 3:40 PM on March 14, 2014:

If there are persistent (keep-alive) HTTP connections, then they prevent bitcoin from shutting down.

Looking at this code again, I think this isn't the best fix-- it will only fix the problem if there is one persistent connection and that connection sends the "stop". I'll commit a better fix shortly.
laanwj commented at 10:23 AM on March 15, 2014: member

ACK
BitcoinPullTester commented at 8:47 PM on March 18, 2014: none

Automatic sanity-testing: FAILED MERGE, see http://jenkins.bluematt.me/pull-tester/5e090313ea50900ce91871725283717701ea8f93 for test log.

This pull does not merge cleanly onto current master This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
alonmuroch commented at 2:54 PM on March 24, 2014: contributor

ACK
laanwj commented at 6:16 PM on March 24, 2014: member

Merged as d138598
laanwj closed this on Mar 24, 2014
DrahtBot locked this on Sep 8, 2021

Contributors