Merge pull request bottlepy#489 from fatiherikli/master

Some fixes on tests

test/test_auth.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import unittest
 import bottle
 from tools import ServerTestBase
 

test/test_environ.py

@@ -2,12 +2,11 @@
 ''' Tests for the BaseRequest and BaseResponse objects and their subclasses. '''
 
 import unittest
-import sys, os.path
+import sys
 import bottle
-from bottle import request, response, tob, touni, tonat, json_dumps, _e, HTTPError
+from bottle import request, tob, touni, tonat, json_dumps, _e, HTTPError
 import tools
 import wsgiref.util
-import threading
 import base64
 
 from bottle import BaseRequest, BaseResponse, LocalRequest

test/test_mount.py

@@ -1,6 +1,6 @@
 import bottle
 from tools import ServerTestBase
-from bottle import Bottle, response
+from bottle import response
 
 class TestAppMounting(ServerTestBase):
     def setUp(self):

test/test_plugins.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import unittest
-import bottle
 import tools
 
 

test/test_resources.py

@@ -1,5 +1,3 @@
-import bottle
-from tools import ServerTestBase
 from bottle import ResourceManager
 import os.path
 import unittest

test/test_router.py

@@ -1,8 +1,9 @@
 import unittest
 import bottle
 
+
 class TestRouter(unittest.TestCase):
-    CGI=False
+    CGI = False
 
     def setUp(self):
         self.r = bottle.Router()
@@ -130,5 +131,5 @@ class TestRouterInCGIMode(TestRouter):
     CGI = True
 
 
-if __name__ == '__main__': #pragma: no cover
+if __name__ == '__main__':  # pragma: no cover
     unittest.main()

test/test_securecookies.py

@@ -1,5 +1,6 @@
 #coding: utf-8
 import unittest
+
 import bottle
 from bottle import tob, touni
 

test/test_sendfile.py

@@ -1,8 +1,7 @@
 import unittest
-from bottle import static_file, HTTPError, HTTPResponse, request, response, parse_date, parse_range_header, Bottle, tob
+from bottle import static_file, request, response, parse_date, parse_range_header, Bottle, tob
 import wsgiref.util
 import os
-import os.path
 import tempfile
 import time
 

test/test_server.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import unittest
-import bottle
 import time
 from tools import tob
 import sys
@@ -119,7 +118,7 @@ class TestRocketServer(TestServer):
 class TestFapwsServer(TestServer):
     server = 'fapws3'
 
-class TestFapwsServer(TestServer):
+class MeinheldServer(TestServer):
     server = 'meinheld'
 
 class TestBjoernServer(TestServer):

test/test_wsgi.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import unittest
-import sys, os.path
 import bottle
 from tools import ServerTestBase
 from bottle import tob

test/testall.py

@@ -22,21 +22,23 @@
     ''')
     sys.exit(0)
 
-
 if 'fast' in sys.argv:
     sys.stderr.write("Warning: The 'fast' keyword skipps server tests.\n")
     test_names.remove('test_server')
 
 cov = None
 if 'coverage' in sys.argv:
     import coverage
+
     cov = coverage.coverage(data_suffix=True, branch=True)
     cov.start()
 
 suite = unittest.defaultTestLoader.loadTestsFromNames(test_names)
 
+
 def run():
     import bottle
+
     bottle.debug(True)
     vlevel = 2 if 'verbose' in sys.argv else 0
     result = unittest.TextTestRunner(verbosity=vlevel).run(suite)
@@ -48,13 +50,15 @@ def run():
         # recognized
         cnew = coverage.coverage(data_suffix=True, branch=True)
         cnew.combine()
-        cnew.report(morfs=['bottle.py']+test_files, show_missing=False)
+        cnew.report(morfs=['bottle.py'] + test_files, show_missing=False)
         if 'html' in sys.argv:
             print
-            cnew.html_report(morfs=['bottle.py']+test_files, directory='../build/coverage')
+            cnew.html_report(morfs=['bottle.py'] + test_files,
+                             directory='../build/coverage')
 
     sys.exit((result.errors or result.failures) and 1 or 0)
 
+
 if __name__ == '__main__':
     run()
 

test/tools.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 import bottle
-import threading
 import sys
-import time
 import unittest
 import wsgiref
-import wsgiref.simple_server
 import wsgiref.util
 import wsgiref.validate