Improve test coverage

Author: asvetlov

.coveragerc

@@ -3,10 +3,5 @@ branch = True
 source = aiohttp, tests
 omit = site-packages
 
-[report]
-exclude_lines =
-    @abc.
-    pragma: no cover
-
 [html]
 directory = coverage

.travis.yml

@@ -9,6 +9,8 @@ install:
   - pip install flake8
   - pip install docutils
   - pip install coverage
+  - pip install gunicorn
+  - pip install chardet
   - python setup.py develop
 
 script:

aiohttp/client.py

@@ -741,7 +741,7 @@ def _get_encoding(self, encoding):
             encoding = params.get('charset')
             if not encoding and chardet:
                 encoding = chardet.detect(self._content)['encoding']
-            if not encoding:  # pragma: no cover
+            if not encoding:
                 encoding = 'utf-8'
 
         return encoding

tests/test_client.py

@@ -13,7 +13,7 @@
 
 try:
     import chardet
-except ImportError:
+except ImportError:  # pragma: no cover
     chardet = None
 
 
@@ -171,14 +171,27 @@ def second_call(*args, **kwargs):
         content.read.side_effect = side_effect
         self.response.close = unittest.mock.Mock()
 
-        if chardet is None:
+        res = self.loop.run_until_complete(self.response.text())
+        self.assertEqual(res, '{"тест": "пройден"}')
+        self.assertTrue(self.response.close.called)
+
+    def test_text_detect_encoding_without_chardet(self):
+        def side_effect(*args, **kwargs):
+            def second_call(*args, **kwargs):
+                raise aiohttp.EofStream
+            fut = asyncio.Future(loop=self.loop)
+            fut.set_result('{"тест": "пройден"}'.encode('cp1251'))
+            content.read.side_effect = second_call
+            return fut
+        self.response.headers = {'CONTENT-TYPE': 'application/json'}
+        content = self.response.content = unittest.mock.Mock()
+        content.read.side_effect = side_effect
+        self.response.close = unittest.mock.Mock()
+
+        with unittest.mock.patch('aiohttp.client.chardet', None):
             self.assertRaises(UnicodeDecodeError,
                               self.loop.run_until_complete,
                               self.response.text())
-        else:
-            res = self.loop.run_until_complete(self.response.text())
-            self.assertEqual(res, '{"тест": "пройден"}')
-            self.assertTrue(self.response.close.called)
 
     def test_json(self):
         def side_effect(*args, **kwargs):
@@ -254,14 +267,27 @@ def second_call(*args, **kwargs):
         content.read.side_effect = side_effect
         self.response.close = unittest.mock.Mock()
 
-        if chardet is None:
+        res = self.loop.run_until_complete(self.response.json())
+        self.assertEqual(res, {'тест': 'пройден'})
+        self.assertTrue(self.response.close.called)
+
+    def test_json_detect_encoding_without_chardet(self):
+        def side_effect(*args, **kwargs):
+            def second_call(*args, **kwargs):
+                raise aiohttp.EofStream
+            fut = asyncio.Future(loop=self.loop)
+            fut.set_result('{"тест": "пройден"}'.encode('cp1251'))
+            content.read.side_effect = second_call
+            return fut
+        self.response.headers = {'CONTENT-TYPE': 'application/json'}
+        content = self.response.content = unittest.mock.Mock()
+        content.read.side_effect = side_effect
+        self.response.close = unittest.mock.Mock()
+
+        with unittest.mock.patch('aiohttp.client.chardet', None):
             self.assertRaises(UnicodeDecodeError,
                               self.loop.run_until_complete,
                               self.response.json())
-        else:
-            res = self.loop.run_until_complete(self.response.json())
-            self.assertEqual(res, {'тест': 'пройден'})
-            self.assertTrue(self.response.close.called)
 
     def test_override_flow_control(self):
         class MyResponse(ClientResponse):

tests/test_client_functional.py

@@ -1063,11 +1063,7 @@ class Functional(test_utils.Router):
 
     @test_utils.Router.define('/method/([A-Za-z]+)$')
     def method(self, match):
-        meth = match.group(1).upper()
-        if meth == self._method:
-            self._response(self._start_response(200))
-        else:
-            self._response(self._start_response(400))
+        self._response(self._start_response(200))
 
     @test_utils.Router.define('/redirect_err$')
     def redirect_err(self, match):

tests/test_connector.py

@@ -394,7 +394,7 @@ def coro(*args, **kw):
             if isinstance(return_value, Exception):
                 raise return_value
             return return_value
-            yield
+            yield  # pragma: no cover
         mock.side_effect = coro
 
     def test_ctor(self):