4a5
> import pytest
10a12
> from conftest import option
59c61
< self.fail('Client can\'t connect to the server.')
---
> pytest.fail('Client can\'t connect to the server.')
131c133
< if TestUnit.detailed:
---
> if option.detailed:
140c142
< if TestUnit.detailed:
---
> if option.detailed:
193c195
< self.fail('Can\'t read response from server.')
---
> pytest.fail('Can\'t read response from server.')
246c248
< self.fail('Invalid chunked body')
---
> pytest.fail('Invalid chunked body')
249c251
< self.fail('No CRLF at the end of the body')
---
> pytest.fail('No CRLF at the end of the body')
254c256
< self.fail('Invalid zero size chunk')
---
> pytest.fail('Invalid zero size chunk')
257c259
< self.fail('Incomplete body')
---
> pytest.fail('Incomplete body')
264c266
< self.fail('Invalid chunk size %s' % str(size))
---
> pytest.fail('Invalid chunk size %s' % str(size))
267c269
< self.assertEqual(len(chunks), 1, 'last zero size')
---
> assert len(chunks) == 1, 'last zero size'
283,284c285,286
< self.assertIn('Content-Type', headers)
< self.assertEqual(headers['Content-Type'], 'application/json')
---
> assert 'Content-Type' in headers
> assert headers['Content-Type'] == 'application/json'
308c310
< self.assertTrue(ret, 'socket connected')
---
> assert ret, 'socket connected'
348c350
< self.fail('multipart encoding of file requires a stream.')
---
> pytest.fail('multipart encoding of file requires a stream.')
356c358
< self.fail('multipart requires a string or stream data')
---
> pytest.fail('multipart requires a string or stream data')