CI: migrate to pytest and GitHub Actions (#197)

Signed-off-by: Inada Naoki <[email protected]>
fluent · Feb 28, 2024 · 6ba7e4d · 6ba7e4d
1 parent a77feda
commit 6ba7e4d
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 107 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,26 @@
+name: Run test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.9", "pypy3.10"]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+        cache: "pip"
+        cache-dependency-path: requirements-dev.txt
+    - name: Install dependencies
+      run: python -m pip install -r requirements-dev.txt
+    - name: Run tests
+      run: pytest --cov=fluent
diff --git a/.travis.yml b/.travis.yml
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1,3 @@
+pytest
+pytest-cov
+msgpack
diff --git a/tests/mockserver.py b/tests/mockserver.py
@@ -92,6 +92,3 @@ def close(self):
                 pass
 
         self.join()
-
-    def __del__(self):
-        self.close()
diff --git a/tests/test_asynchandler.py b/tests/test_asynchandler.py
@@ -20,6 +20,12 @@
 from tests import mockserver
 
 
+def get_logger(name, level=logging.INFO):
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+    return logger
+
+
 class TestHandler(unittest.TestCase):
     def setUp(self):
         super(TestHandler, self).setUp()
@@ -40,8 +46,7 @@ def test_simple(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info({
@@ -63,8 +68,7 @@ def test_custom_fmt(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(
                 fluent.handler.FluentRecordFormatter(fmt={
                     'name': '%(name)s',
@@ -86,8 +90,7 @@ def test_custom_fmt_with_format_style(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(
                 fluent.handler.FluentRecordFormatter(fmt={
                     'name': '{name}',
@@ -109,8 +112,7 @@ def test_custom_fmt_with_template_style(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(
                 fluent.handler.FluentRecordFormatter(fmt={
                     'name': '${name}',
@@ -131,8 +133,7 @@ def test_custom_field_raise_exception(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(
                 fluent.handler.FluentRecordFormatter(fmt={
                     'name': '%(name)s',
@@ -147,8 +148,7 @@ def test_custom_field_raise_exception(self):
     def test_custom_field_fill_missing_fmt_key_is_true(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(
                 fluent.handler.FluentRecordFormatter(fmt={
                     'name': '%(name)s',
@@ -172,8 +172,7 @@ def test_json_encoded_message(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info('{"key": "hello world!", "param": "value"}')
@@ -186,8 +185,7 @@ def test_unstructured_message(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info('hello %s', 'world')
@@ -200,8 +198,7 @@ def test_unstructured_formatted_message(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info('hello world, %s', 'you!')
@@ -214,8 +211,7 @@ def test_number_string_simple_message(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info("1")
@@ -227,8 +223,7 @@ def test_non_string_simple_message(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info(42)
@@ -240,8 +235,7 @@ def test_non_string_dict_message(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info({42: 'root'})
@@ -254,8 +248,7 @@ def test_exception_message(self):
         handler = self.get_handler_class()('app.follow', port=self._port)
 
         with handler:
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             try:
@@ -297,8 +290,7 @@ def test_simple(self):
             self.assertEqual(handler.sender.queue_circular, True)
             self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE)
 
-            logging.basicConfig(level=logging.INFO)
-            log = logging.getLogger('fluent.test')
+            log = get_logger('fluent.test')
             handler.setFormatter(fluent.handler.FluentRecordFormatter())
             log.addHandler(handler)
             log.info({'cnt': 1, 'from': 'userA', 'to': 'userB'})
@@ -359,8 +351,7 @@ def custom_full_queue():
                 self.assertEqual(handler.sender.queue_circular, True)
                 self.assertEqual(handler.sender.queue_maxsize, self.Q_SIZE)
 
-                logging.basicConfig(level=logging.INFO)
-                log = logging.getLogger('fluent.test')
+                log = get_logger('fluent.test')
                 handler.setFormatter(fluent.handler.FluentRecordFormatter())
                 log.addHandler(handler)
 

diff --git a/tests/test_event.py b/tests/test_event.py
@@ -6,7 +6,8 @@
 from tests import mockserver
 
 
-class TestException(BaseException): pass
+class TestException(BaseException):
+    __test__ = False  # teach pytest this is not test class.
 
 
 class TestEvent(unittest.TestCase):
@@ -18,7 +19,7 @@ def tearDown(self):
         from fluent.sender import _set_global_sender
         sender.close()
         _set_global_sender(None)
-
+ 
     def test_logging(self):
         # XXX: This tests succeeds even if the fluentd connection failed
         # send event with tag app.follow