Skip to content
Snippets Groups Projects
Commit 398d78a7 authored by Monty Brandenberg's avatar Monty Brandenberg
Browse files

Rework the 'sleep' logic in the test HTTP server so that the

30-second hang doesn't break subsequent tests.  Did this by
introducing threads into the HTTP server as I can't find the magic
to detect that my client has gone away.
parent 348db20b
No related branches found
No related tags found
No related merge requests found
......@@ -1381,8 +1381,6 @@ void HttpRequestTestObjectType::test<13>()
}
// *NB: This test must be last. The sleeping webserver
// won't respond for a long time.
template <> template <>
void HttpRequestTestObjectType::test<14>()
{
......@@ -1503,9 +1501,6 @@ void HttpRequestTestObjectType::test<14>()
throw;
}
}
// *NOTE: This test ^^^^^^^^ must be the last one in the set. It uses a
// sleeping service that interferes with other HTTP tests. Keep it
// last until that little HTTP server can get some attention...
} // end namespace tut
......
......@@ -32,10 +32,12 @@
import os
import sys
import time
import select
from threading import Thread
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
from SocketServer import ThreadingMixIn
mydir = os.path.dirname(__file__) # expected to be .../indra/llmessage/tests/
mydir = os.path.dirname(__file__) # expected to be .../indra/llcorehttp/tests/
sys.path.insert(0, os.path.join(mydir, os.pardir, os.pardir, "lib", "python"))
from indra.util.fastest_elementtree import parse as xml_parse
from indra.base import llsd
......@@ -144,7 +146,7 @@ def log_error(self, format, *args):
# Suppress error output as well
pass
class Server(HTTPServer):
class Server(ThreadingMixIn, HTTPServer):
# This pernicious flag is on by default in HTTPServer. But proper
# operation of freeport() absolutely depends on it being off.
allow_reuse_address = False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment