Changeset 6cec675 in mod_gnutls

Timestamp:

Oct 8, 2020, 3:58:40 PM (7 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio

Children:

90d750d, b0f93c4

Parents:

60a415a

Message:

Fix remaining flake8 warnings in mgstest.tests

That's all, minus instances of "E722 do not use bare 'except'", which
I think is valid in certain cases (usually with a "raise" in the
handler block). :-)

File:

• test/mgstest/tests.py (modified) (6 diffs)

test/mgstest/tests.py

@@ -253 +253 @@
         """
         >>> r1 = TestRequest(path='/test.txt',
-        ...                  expect={ 'headers': {'X-Forbidden-Header': None,
-        ...                                       'X-Required-Header': 'Hi!' }})
+        ...                  expect={'headers': {'X-Forbidden-Header': None,
+        ...                                      'X-Required-Header': 'Hi!'}})
         >>> r1.check_headers({ 'X-Required-Header': 'Hi!' })
         >>> r1.check_headers({ 'X-Required-Header': 'Hello!' })
         Traceback (most recent call last):
         ...
-        mgstest.TestExpectationFailed: Unexpected value in header X-Required-Header: 'Hello!', expected 'Hi!'
+        mgstest.TestExpectationFailed: Unexpected value in header \
+X-Required-Header: 'Hello!', expected 'Hi!'
         >>> r1.check_headers({ 'X-Forbidden-Header': 'Hi!' })
         Traceback (most recent call last):
         ...
-        mgstest.TestExpectationFailed: Unexpected value in header X-Forbidden-Header: 'Hi!', expected None
+        mgstest.TestExpectationFailed: Unexpected value in header \
+X-Forbidden-Header: 'Hi!', expected None
         """
         for name, expected in self.expect['headers'].items():
@@ -275 +277 @@
     def check_body(self, body):
         """
-        >>> r1 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'status': 200, 'body': {'exactly': 'test\\n'}})
+        >>> r1 = TestRequest(path='/test.txt', method='GET', headers={}, \
+expect={'status': 200, 'body': {'exactly': 'test\\n'}})
         >>> r1.check_body('test\\n')
         >>> r1.check_body('xyz\\n')
@@ -281 +284 @@
         ...
         mgstest.TestExpectationFailed: Unexpected body: 'xyz\\n' != 'test\\n'
-        >>> r2 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'status': 200, 'body': {'contains': ['tes', 'est']}})
+        >>> r2 = TestRequest(path='/test.txt', method='GET', headers={}, \
+expect={'status': 200, 'body': {'contains': ['tes', 'est']}})
         >>> r2.check_body('test\\n')
         >>> r2.check_body('est\\n')
         Traceback (most recent call last):
         ...
-        mgstest.TestExpectationFailed: Unexpected body: 'est\\n' does not contain 'tes'
-        >>> r3 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'status': 200, 'body': {'contains': 'test'}})
+        mgstest.TestExpectationFailed: Unexpected body: 'est\\n' \
+does not contain 'tes'
+        >>> r3 = TestRequest(path='/test.txt', method='GET', headers={}, \
+expect={'status': 200, 'body': {'contains': 'test'}})
         >>> r3.check_body('test\\n')
         """
@@ -300 +306 @@
                     self.expect['body']['contains']]
             for s in self.expect['body']['contains']:
-                if not s in body:
+                if s not in body:
                     raise TestExpectationFailed(
                         f'Unexpected body: {body!r} does not contain '
@@ -323 +329 @@
         connection failed.
 
-        >>> r1 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'status': 200, 'body': {'contains': 'test'}})
+        >>> r1 = TestRequest(path='/test.txt', method='GET', headers={}, \
+expect={'status': 200, 'body': {'contains': 'test'}})
         >>> r1.expects_conn_reset()
         False
-        >>> r2 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'reset': True})
+        >>> r2 = TestRequest(path='/test.txt', method='GET', headers={}, \
+expect={'reset': True})
         >>> r2.expects_conn_reset()
         True
@@ -444 +452 @@
 
     def run(self, conn, command):
-        if not '--inline-commands' in command:
+        if '--inline-commands' not in command:
             raise ValueError('gnutls_params must include "inline-commands" '
                              'to use the resume action!')