Merged with the default branch.1.20.0-1

1 files changed, 125 insertions, 151 deletions

diff --git a/test/test_ruby_application.py b/test/test_ruby_application.py
index 4709df6c..f84935f8 100644
--- a/test/test_ruby_application.py
+++ b/test/test_ruby_application.py
@@ -1,5 +1,8 @@
-import unittest
+import re
 
+import pytest
+
+from conftest import skip_alert
 from unit.applications.lang.ruby import TestApplicationRuby
 
 
@@ -21,173 +24,151 @@ class TestRubyApplication(TestApplicationRuby):
             body=body,
         )
 
-        self.assertEqual(resp['status'], 200, 'status')
+        assert resp['status'] == 200, 'status'
         headers = resp['headers']
         header_server = headers.pop('Server')
-        self.assertRegex(header_server, r'Unit/[\d\.]+', 'server header')
-        self.assertEqual(
-            headers.pop('Server-Software'),
-            header_server,
-            'server software header',
-        )
+        assert re.search(r'Unit/[\d\.]+', header_server), 'server header'
+        assert (
+            headers.pop('Server-Software') == header_server
+        ), 'server software header'
 
         date = headers.pop('Date')
-        self.assertEqual(date[-4:], ' GMT', 'date header timezone')
-        self.assertLess(
-            abs(self.date_to_sec_epoch(date) - self.sec_epoch()),
-            5,
-            'date header',
-        )
-
-        self.assertDictEqual(
-            headers,
-            {
-                'Connection': 'close',
-                'Content-Length': str(len(body)),
-                'Content-Type': 'text/html',
-                'Request-Method': 'POST',
-                'Request-Uri': '/',
-                'Http-Host': 'localhost',
-                'Server-Protocol': 'HTTP/1.1',
-                'Custom-Header': 'blah',
-                'Rack-Version': '13',
-                'Rack-Url-Scheme': 'http',
-                'Rack-Multithread': 'false',
-                'Rack-Multiprocess': 'true',
-                'Rack-Run-Once': 'false',
-                'Rack-Hijack-Q': 'false',
-                'Rack-Hijack': '',
-                'Rack-Hijack-IO': '',
-            },
-            'headers',
-        )
-        self.assertEqual(resp['body'], body, 'body')
+        assert date[-4:] == ' GMT', 'date header timezone'
+        assert (
+            abs(self.date_to_sec_epoch(date) - self.sec_epoch()) < 5
+        ), 'date header'
+
+        assert headers == {
+            'Connection': 'close',
+            'Content-Length': str(len(body)),
+            'Content-Type': 'text/html',
+            'Request-Method': 'POST',
+            'Request-Uri': '/',
+            'Http-Host': 'localhost',
+            'Server-Protocol': 'HTTP/1.1',
+            'Custom-Header': 'blah',
+            'Rack-Version': '13',
+            'Rack-Url-Scheme': 'http',
+            'Rack-Multithread': 'false',
+            'Rack-Multiprocess': 'true',
+            'Rack-Run-Once': 'false',
+            'Rack-Hijack-Q': 'false',
+            'Rack-Hijack': '',
+            'Rack-Hijack-IO': '',
+        }, 'headers'
+        assert resp['body'] == body, 'body'
 
     def test_ruby_application_query_string(self):
         self.load('query_string')
 
         resp = self.get(url='/?var1=val1&var2=val2')
 
-        self.assertEqual(
-            resp['headers']['Query-String'],
-            'var1=val1&var2=val2',
-            'Query-String header',
-        )
+        assert (
+            resp['headers']['Query-String'] == 'var1=val1&var2=val2'
+        ), 'Query-String header'
 
     def test_ruby_application_query_string_empty(self):
         self.load('query_string')
 
         resp = self.get(url='/?')
 
-        self.assertEqual(resp['status'], 200, 'query string empty status')
-        self.assertEqual(
-            resp['headers']['Query-String'], '', 'query string empty'
-        )
+        assert resp['status'] == 200, 'query string empty status'
+        assert resp['headers']['Query-String'] == '', 'query string empty'
 
     def test_ruby_application_query_string_absent(self):
         self.load('query_string')
 
         resp = self.get()
 
-        self.assertEqual(resp['status'], 200, 'query string absent status')
-        self.assertEqual(
-            resp['headers']['Query-String'], '', 'query string absent'
-        )
+        assert resp['status'] == 200, 'query string absent status'
+        assert resp['headers']['Query-String'] == '', 'query string absent'
 
-    @unittest.skip('not yet')
+    @pytest.mark.skip('not yet')
     def test_ruby_application_server_port(self):
         self.load('server_port')
 
-        self.assertEqual(
-            self.get()['headers']['Server-Port'], '7080', 'Server-Port header'
-        )
+        assert (
+            self.get()['headers']['Server-Port'] == '7080'
+        ), 'Server-Port header'
 
     def test_ruby_application_status_int(self):
         self.load('status_int')
 
-        self.assertEqual(self.get()['status'], 200, 'status int')
+        assert self.get()['status'] == 200, 'status int'
 
     def test_ruby_application_input_read_empty(self):
         self.load('input_read_empty')
 
-        self.assertEqual(self.get()['body'], '', 'read empty')
+        assert self.get()['body'] == '', 'read empty'
 
     def test_ruby_application_input_read_parts(self):
         self.load('input_read_parts')
 
-        self.assertEqual(
-            self.post(body='0123456789')['body'],
-            '012345678',
-            'input read parts',
-        )
+        assert (
+            self.post(body='0123456789')['body'] == '012345678'
+        ), 'input read parts'
 
     def test_ruby_application_input_read_buffer(self):
         self.load('input_read_buffer')
 
-        self.assertEqual(
-            self.post(body='0123456789')['body'],
-            '0123456789',
-            'input read buffer',
-        )
+        assert (
+            self.post(body='0123456789')['body'] == '0123456789'
+        ), 'input read buffer'
 
     def test_ruby_application_input_read_buffer_not_empty(self):
         self.load('input_read_buffer_not_empty')
 
-        self.assertEqual(
-            self.post(body='0123456789')['body'],
-            '0123456789',
-            'input read buffer not empty',
-        )
+        assert (
+            self.post(body='0123456789')['body'] == '0123456789'
+        ), 'input read buffer not empty'
 
     def test_ruby_application_input_gets(self):
         self.load('input_gets')
 
         body = '0123456789'
 
-        self.assertEqual(self.post(body=body)['body'], body, 'input gets')
+        assert self.post(body=body)['body'] == body, 'input gets'
 
     def test_ruby_application_input_gets_2(self):
         self.load('input_gets')
 
-        self.assertEqual(
-            self.post(body='01234\n56789\n')['body'], '01234\n', 'input gets 2'
-        )
+        assert (
+            self.post(body='01234\n56789\n')['body'] == '01234\n'
+        ), 'input gets 2'
 
     def test_ruby_application_input_gets_all(self):
         self.load('input_gets_all')
 
         body = '\n01234\n56789\n\n'
 
-        self.assertEqual(self.post(body=body)['body'], body, 'input gets all')
+        assert self.post(body=body)['body'] == body, 'input gets all'
 
     def test_ruby_application_input_each(self):
         self.load('input_each')
 
         body = '\n01234\n56789\n\n'
 
-        self.assertEqual(self.post(body=body)['body'], body, 'input each')
+        assert self.post(body=body)['body'] == body, 'input each'
 
-    @unittest.skip('not yet')
+    @pytest.mark.skip('not yet')
     def test_ruby_application_input_rewind(self):
         self.load('input_rewind')
 
         body = '0123456789'
 
-        self.assertEqual(self.post(body=body)['body'], body, 'input rewind')
+        assert self.post(body=body)['body'] == body, 'input rewind'
 
-    @unittest.skip('not yet')
+    @pytest.mark.skip('not yet')
     def test_ruby_application_syntax_error(self):
-        self.skip_alerts.extend(
-            [
-                r'Failed to parse rack script',
-                r'syntax error',
-                r'new_from_string',
-                r'parse_file',
-            ]
+        skip_alert(
+            r'Failed to parse rack script',
+            r'syntax error',
+            r'new_from_string',
+            r'parse_file',
         )
         self.load('syntax_error')
 
-        self.assertEqual(self.get()['status'], 500, 'syntax error')
+        assert self.get()['status'] == 500, 'syntax error'
 
     def test_ruby_application_errors_puts(self):
         self.load('errors_puts')
@@ -196,10 +177,10 @@ class TestRubyApplication(TestApplicationRuby):
 
         self.stop()
 
-        self.assertIsNotNone(
-            self.wait_for_record(r'\[error\].+Error in application'),
-            'errors puts',
-        )
+        assert (
+            self.wait_for_record(r'\[error\].+Error in application')
+            is not None
+        ), 'errors puts'
 
     def test_ruby_application_errors_puts_int(self):
         self.load('errors_puts_int')
@@ -208,9 +189,9 @@ class TestRubyApplication(TestApplicationRuby):
 
         self.stop()
 
-        self.assertIsNotNone(
-            self.wait_for_record(r'\[error\].+1234567890'), 'errors puts int'
-        )
+        assert (
+            self.wait_for_record(r'\[error\].+1234567890') is not None
+        ), 'errors puts int'
 
     def test_ruby_application_errors_write(self):
         self.load('errors_write')
@@ -219,15 +200,15 @@ class TestRubyApplication(TestApplicationRuby):
 
         self.stop()
 
-        self.assertIsNotNone(
-            self.wait_for_record(r'\[error\].+Error in application'),
-            'errors write',
-        )
+        assert (
+            self.wait_for_record(r'\[error\].+Error in application')
+            is not None
+        ), 'errors write'
 
     def test_ruby_application_errors_write_to_s_custom(self):
         self.load('errors_write_to_s_custom')
 
-        self.assertEqual(self.get()['status'], 200, 'errors write to_s custom')
+        assert self.get()['status'] == 200, 'errors write to_s custom'
 
     def test_ruby_application_errors_write_int(self):
         self.load('errors_write_int')
@@ -236,9 +217,9 @@ class TestRubyApplication(TestApplicationRuby):
 
         self.stop()
 
-        self.assertIsNotNone(
-            self.wait_for_record(r'\[error\].+1234567890'), 'errors write int'
-        )
+        assert (
+            self.wait_for_record(r'\[error\].+1234567890') is not None
+        ), 'errors write int'
 
     def test_ruby_application_at_exit(self):
         self.load('at_exit')
@@ -249,79 +230,81 @@ class TestRubyApplication(TestApplicationRuby):
 
         self.stop()
 
-        self.assertIsNotNone(
-            self.wait_for_record(r'\[error\].+At exit called\.'), 'at exit'
-        )
+        assert (
+            self.wait_for_record(r'\[error\].+At exit called\.') is not None
+        ), 'at exit'
 
     def test_ruby_application_header_custom(self):
         self.load('header_custom')
 
         resp = self.post(body="\ntc=one,two\ntc=three,four,\n\n")
 
-        self.assertEqual(
-            resp['headers']['Custom-Header'],
-            ['', 'tc=one,two', 'tc=three,four,', '', ''],
-            'header custom',
-        )
+        assert resp['headers']['Custom-Header'] == [
+            '',
+            'tc=one,two',
+            'tc=three,four,',
+            '',
+            '',
+        ], 'header custom'
 
-    @unittest.skip('not yet')
+    @pytest.mark.skip('not yet')
     def test_ruby_application_header_custom_non_printable(self):
         self.load('header_custom')
 
-        self.assertEqual(
-            self.post(body='\b')['status'], 500, 'header custom non printable'
-        )
+        assert (
+            self.post(body='\b')['status'] == 500
+        ), 'header custom non printable'
 
     def test_ruby_application_header_status(self):
         self.load('header_status')
 
-        self.assertEqual(self.get()['status'], 200, 'header status')
+        assert self.get()['status'] == 200, 'header status'
 
-    @unittest.skip('not yet')
+    @pytest.mark.skip('not yet')
     def test_ruby_application_header_rack(self):
         self.load('header_rack')
 
-        self.assertEqual(self.get()['status'], 500, 'header rack')
+        assert self.get()['status'] == 500, 'header rack'
 
     def test_ruby_application_body_empty(self):
         self.load('body_empty')
 
-        self.assertEqual(self.get()['body'], '', 'body empty')
+        assert self.get()['body'] == '', 'body empty'
 
     def test_ruby_application_body_array(self):
         self.load('body_array')
 
-        self.assertEqual(self.get()['body'], '0123456789', 'body array')
+        assert self.get()['body'] == '0123456789', 'body array'
 
     def test_ruby_application_body_large(self):
         self.load('mirror')
 
         body = '0123456789' * 1000
 
-        self.assertEqual(self.post(body=body)['body'], body, 'body large')
+        assert self.post(body=body)['body'] == body, 'body large'
 
-    @unittest.skip('not yet')
+    @pytest.mark.skip('not yet')
     def test_ruby_application_body_each_error(self):
         self.load('body_each_error')
 
-        self.assertEqual(self.get()['status'], 500, 'body each error status')
+        assert self.get()['status'] == 500, 'body each error status'
 
         self.stop()
 
-        self.assertIsNotNone(
-            self.wait_for_record(r'\[error\].+Failed to run ruby script'),
-            'body each error',
-        )
+        assert (
+            self.wait_for_record(r'\[error\].+Failed to run ruby script')
+            is not None
+        ), 'body each error'
 
     def test_ruby_application_body_file(self):
         self.load('body_file')
 
-        self.assertEqual(self.get()['body'], 'body\n', 'body file')
+        assert self.get()['body'] == 'body\n', 'body file'
 
     def test_ruby_keepalive_body(self):
         self.load('mirror')
 
-        self.assertEqual(self.get()['status'], 200, 'init')
+        assert self.get()['status'] == 200, 'init'
 
         body = '0123456789' * 500
         (resp, sock) = self.post(
@@ -335,7 +318,7 @@ class TestRubyApplication(TestApplicationRuby):
             read_timeout=1,
         )
 
-        self.assertEqual(resp['body'], body, 'keep-alive 1')
+        assert resp['body'] == body, 'keep-alive 1'
 
         body = '0123456789'
         resp = self.post(
@@ -348,31 +331,22 @@ class TestRubyApplication(TestApplicationRuby):
             body=body,
         )
 
-        self.assertEqual(resp['body'], body, 'keep-alive 2')
+        assert resp['body'] == body, 'keep-alive 2'
 
     def test_ruby_application_constants(self):
         self.load('constants')
 
         resp = self.get()
 
-        self.assertEqual(resp['status'], 200, 'status')
+        assert resp['status'] == 200, 'status'
 
         headers = resp['headers']
-        self.assertGreater(len(headers['X-Copyright']), 0, 'RUBY_COPYRIGHT')
-        self.assertGreater(
-            len(headers['X-Description']), 0, 'RUBY_DESCRIPTION'
-        )
-        self.assertGreater(len(headers['X-Engine']), 0, 'RUBY_ENGINE')
-        self.assertGreater(
-            len(headers['X-Engine-Version']), 0, 'RUBY_ENGINE_VERSION'
-        )
-        self.assertGreater(len(headers['X-Patchlevel']), 0, 'RUBY_PATCHLEVEL')
-        self.assertGreater(len(headers['X-Platform']), 0, 'RUBY_PLATFORM')
-        self.assertGreater(
-            len(headers['X-Release-Date']), 0, 'RUBY_RELEASE_DATE'
-        )
-        self.assertGreater(len(headers['X-Revision']), 0, 'RUBY_REVISION')
-        self.assertGreater(len(headers['X-Version']), 0, 'RUBY_VERSION')
-
-if __name__ == '__main__':
-    TestRubyApplication.main()
+        assert len(headers['X-Copyright']) > 0, 'RUBY_COPYRIGHT'
+        assert len(headers['X-Description']) > 0, 'RUBY_DESCRIPTION'
+        assert len(headers['X-Engine']) > 0, 'RUBY_ENGINE'
+        assert len(headers['X-Engine-Version']) > 0, 'RUBY_ENGINE_VERSION'
+        assert len(headers['X-Patchlevel']) > 0, 'RUBY_PATCHLEVEL'
+        assert len(headers['X-Platform']) > 0, 'RUBY_PLATFORM'
+        assert len(headers['X-Release-Date']) > 0, 'RUBY_RELEASE_DATE'
+        assert len(headers['X-Revision']) > 0, 'RUBY_REVISION'
+        assert len(headers['X-Version']) > 0, 'RUBY_VERSION'