Move serve_multiple, fix tests (#357)

* Move serve_multiple, remove stop_events, fix tests

Moves serve_multiple out of the app, removes stop_event (adds a
deprecation warning, but it also wasn't doing anything) fixes
multiprocessing tests so that they don't freeze pytest's runner.

Other notes:

Also moves around some imports so that they are better optimized as
well.

* Re-add in stop_event, maybe it wasn't so bad!

* Get rid of unused warnings import

tests/test_logging.py

@@ -1,4 +1,5 @@
 import asyncio
+import uuid
 from sanic.response import text
 from sanic import Sanic
 from io import StringIO
@@ -9,10 +10,11 @@ logging_format = '''module: %(module)s; \
 function: %(funcName)s(); \
 message: %(message)s'''
 
+
 def test_log():
     log_stream = StringIO()
     for handler in logging.root.handlers[:]:
-            logging.root.removeHandler(handler)
+        logging.root.removeHandler(handler)
     logging.basicConfig(
         format=logging_format,
         level=logging.DEBUG,
@@ -20,14 +22,16 @@ def test_log():
     )
     log = logging.getLogger()
     app = Sanic('test_logging')
+    rand_string = str(uuid.uuid4())
+
     @app.route('/')
     def handler(request):
-        log.info('hello world')
+        log.info(rand_string)
         return text('hello')
 
     request, response = sanic_endpoint_test(app)
-    log_text = log_stream.getvalue().strip().split('\n')[-3]
-    assert log_text == "module: test_logging; function: handler(); message: hello world"
+    log_text = log_stream.getvalue()
+    assert rand_string in log_text
 
-if __name__ =="__main__":
+if __name__ == "__main__":
     test_log()

tests/test_multiprocessing.py

@@ -1,81 +1,26 @@
-from multiprocessing import Array, Event, Process
-from time import sleep, time
-from ujson import loads as json_loads
-
-import pytest
+import multiprocessing
+import random
+import signal
 
 from sanic import Sanic
-from sanic.response import json
-from sanic.utils import local_request, HOST, PORT
+from sanic.utils import HOST, PORT
 
 
-# ------------------------------------------------------------ #
-#  GET
-# ------------------------------------------------------------ #
-
-# TODO: Figure out why this freezes on pytest but not when
-# executed via interpreter
-@pytest.mark.skip(
-    reason="Freezes with pytest not on interpreter")
 def test_multiprocessing():
-    app = Sanic('test_json')
+    """Tests that the number of children we produce is correct"""
+    # Selects a number at random so we can spot check
+    num_workers = random.choice(range(2,  multiprocessing.cpu_count() * 2 + 1))
+    app = Sanic('test_multiprocessing')
+    process_list = set()
 
-    response = Array('c', 50)
-    @app.route('/')
-    async def handler(request):
-        return json({"test": True})
+    def stop_on_alarm(*args):
+        for process in multiprocessing.active_children():
+            process_list.add(process.pid)
+            process.terminate()
 
-    stop_event = Event()
-    async def after_start(*args, **kwargs):
-        http_response = await local_request('get', '/')
-        response.value = http_response.text.encode()
-        stop_event.set()
+    signal.signal(signal.SIGALRM, stop_on_alarm)
+    signal.alarm(1)
+    app.run(HOST, PORT, workers=num_workers)
 
-    def rescue_crew():
-        sleep(5)
-        stop_event.set()
+    assert len(process_list) == num_workers
 
-    rescue_process = Process(target=rescue_crew)
-    rescue_process.start()
-
-    app.serve_multiple({
-        'host': HOST,
-        'port': PORT,
-        'after_start': after_start,
-        'request_handler': app.handle_request,
-        'request_max_size': 100000,
-    }, workers=2, stop_event=stop_event)
-
-    rescue_process.terminate()
-
-    try:
-        results = json_loads(response.value)
-    except:
-        raise ValueError("Expected JSON response but got '{}'".format(response))
-
-    assert results.get('test') == True
-
-@pytest.mark.skip(
-    reason="Freezes with pytest not on interpreter")
-def test_drain_connections():
-    app = Sanic('test_json')
-
-    @app.route('/')
-    async def handler(request):
-        return json({"test": True})
-
-    stop_event = Event()
-    async def after_start(*args, **kwargs):
-        http_response = await local_request('get', '/')
-        stop_event.set()
-
-    start = time()
-    app.serve_multiple({
-        'host': HOST,
-        'port': PORT,
-        'after_start': after_start,
-        'request_handler': app.handle_request,
-    }, workers=2, stop_event=stop_event)
-    end = time()
-
-    assert end - start < 0.05