Merge pull request #3 from channelcat/master

merge upstream master branch

requirements-docs.txt

@@ -0,0 +1,3 @@
+sphinx
+sphinx_rtd_theme
+recommonmark

sanic/app.py

@@ -33,7 +33,9 @@ class Sanic:
             logging.config.dictConfig(log_config)
         # Only set up a default log handler if the
         # end-user application didn't set anything up.
-        if not logging.root.handlers and log.level == logging.NOTSET:
+        if not (logging.root.handlers and
+                log.level == logging.NOTSET and
+                log_config):
             formatter = logging.Formatter(
                 "%(asctime)s: %(levelname)s: %(message)s")
             handler = logging.StreamHandler()

tests/test_worker.py

@@ -11,7 +11,7 @@ import pytest
 def gunicorn_worker():
     command = 'gunicorn --bind 127.0.0.1:1337 --worker-class sanic.worker.GunicornWorker examples.simple_server:app'
     worker = subprocess.Popen(shlex.split(command))
-    time.sleep(1)
+    time.sleep(3)
     yield
     worker.kill()
 

tox.ini

@@ -9,16 +9,14 @@ setenv =
 deps =
     coverage
     pytest
+    pytest-cov
     pytest-sugar
     aiohttp==1.3.5
     chardet<=2.3.0
     beautifulsoup4
     gunicorn
 commands =
-    pytest tests {posargs}
-    coverage erase
-    coverage run -m sanic.app
-    coverage report
+    pytest tests --cov sanic --cov-report term-missing {posargs}
 
 [testenv:flake8]
 deps =