Merge branch 'master' into testfixes

Author: andymccurdy

.github/workflows/integration.yaml

@@ -2,9 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   integration:

tests/test_pubsub.py

@@ -1,14 +1,12 @@
-import pytest
 import threading
 import time
-
 from unittest import mock
 
+import pytest
 import redis
 from redis.exceptions import ConnectionError
 
-from .conftest import _get_client
-from .conftest import skip_if_server_version_lt
+from .conftest import _get_client, skip_if_server_version_lt
 
 
 def wait_for_message(pubsub, timeout=0.1, ignore_subscribe_messages=False):
@@ -561,6 +559,7 @@ def exception_handler(ex, pubsub, thread):
         with mock.patch.object(p, 'get_message',
                                side_effect=Exception('error')):
             pubsub_thread = p.run_in_thread(
+                daemon=True,
                 exception_handler=exception_handler
             )