From 433aa3e0fec2a5d50bc83195191dd4aafea10242 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Wed, 1 Jun 2022 16:24:30 -0500
Subject: [PATCH 01/61] Import mock via unittest.mock

The `mock` module is deprecated and modern versions of Python havd
`mock` available in the `unittest` standard library.

Fixes: #701

Signed-off-by: Major Hayden <major@mhtx.net>
---
 tests/system.py                                                 | 2 +-
 tests/unit/gapic/pubsub_v1/test_publisher.py                    | 2 +-
 tests/unit/gapic/pubsub_v1/test_schema_service.py               | 2 +-
 tests/unit/gapic/pubsub_v1/test_subscriber.py                   | 2 +-
 tests/unit/pubsub_v1/conftest.py                                | 2 +-
 tests/unit/pubsub_v1/publisher/batch/test_base.py               | 2 +-
 tests/unit/pubsub_v1/publisher/batch/test_thread.py             | 2 +-
 .../pubsub_v1/publisher/sequencer/test_ordered_sequencer.py     | 2 +-
 .../pubsub_v1/publisher/sequencer/test_unordered_sequencer.py   | 2 +-
 tests/unit/pubsub_v1/publisher/test_publisher_client.py         | 2 +-
 tests/unit/pubsub_v1/subscriber/test_dispatcher.py              | 2 +-
 tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py      | 2 +-
 tests/unit/pubsub_v1/subscriber/test_heartbeater.py             | 2 +-
 tests/unit/pubsub_v1/subscriber/test_helper_threads.py          | 2 +-
 tests/unit/pubsub_v1/subscriber/test_leaser.py                  | 2 +-
 tests/unit/pubsub_v1/subscriber/test_message.py                 | 2 +-
 tests/unit/pubsub_v1/subscriber/test_scheduler.py               | 2 +-
 tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py  | 2 +-
 tests/unit/pubsub_v1/subscriber/test_subscriber_client.py       | 2 +-
 tests/unit/pubsub_v1/test_futures.py                            | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/system.py b/tests/system.py
index aa6ca486f..abe49c39d 100644
--- a/tests/system.py
+++ b/tests/system.py
@@ -23,7 +23,7 @@
 import threading
 import time
 
-import mock
+from unittest import mock
 import pytest
 
 import google.auth
diff --git a/tests/unit/gapic/pubsub_v1/test_publisher.py b/tests/unit/gapic/pubsub_v1/test_publisher.py
index c5ab354d6..67778c09f 100644
--- a/tests/unit/gapic/pubsub_v1/test_publisher.py
+++ b/tests/unit/gapic/pubsub_v1/test_publisher.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-import mock
+from unittest import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/pubsub_v1/test_schema_service.py b/tests/unit/gapic/pubsub_v1/test_schema_service.py
index 852e4ef3b..e24e24936 100644
--- a/tests/unit/gapic/pubsub_v1/test_schema_service.py
+++ b/tests/unit/gapic/pubsub_v1/test_schema_service.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-import mock
+from unittest import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/pubsub_v1/test_subscriber.py b/tests/unit/gapic/pubsub_v1/test_subscriber.py
index b4f9b3882..0bd3594dd 100644
--- a/tests/unit/gapic/pubsub_v1/test_subscriber.py
+++ b/tests/unit/gapic/pubsub_v1/test_subscriber.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-import mock
+from unittest import mock
 import warnings
 
 import grpc
diff --git a/tests/unit/pubsub_v1/conftest.py b/tests/unit/pubsub_v1/conftest.py
index 64729a6b5..f81071146 100644
--- a/tests/unit/pubsub_v1/conftest.py
+++ b/tests/unit/pubsub_v1/conftest.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import google.auth.credentials
-import mock
+from unittest import mock
 import pytest
 
 
diff --git a/tests/unit/pubsub_v1/publisher/batch/test_base.py b/tests/unit/pubsub_v1/publisher/batch/test_base.py
index 3ded77b00..359b584ae 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_base.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_base.py
@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-import mock
+from unittest import mock
 
 from google.auth import credentials
 from google.cloud.pubsub_v1 import publisher
diff --git a/tests/unit/pubsub_v1/publisher/batch/test_thread.py b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
index b15128489..f32ecd4c3 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_thread.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
@@ -16,7 +16,7 @@
 import threading
 import time
 
-import mock
+from unittest import mock
 import pytest
 
 import google.api_core.exceptions
diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
index 7384af2a2..16f034eb9 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import concurrent.futures as futures
-import mock
+from unittest import mock
 import pytest
 
 from google.auth import credentials
diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
index ee0cfab83..ad597ab33 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 import pytest
 
 from google.auth import credentials
diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
index 372f53015..aa5f01f81 100644
--- a/tests/unit/pubsub_v1/publisher/test_publisher_client.py
+++ b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -19,7 +19,7 @@
 
 import grpc
 
-import mock
+from unittest import mock
 import pytest
 import time
 import warnings
diff --git a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
index c6902da69..07948fbf8 100644
--- a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
+++ b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
@@ -22,7 +22,7 @@
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 from google.cloud.pubsub_v1.subscriber import futures
 
-import mock
+from unittest import mock
 import pytest
 from google.cloud.pubsub_v1.subscriber.exceptions import (
     AcknowledgeStatus,
diff --git a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
index 9f71109e7..c4c539f96 100644
--- a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
+++ b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-import mock
+from unittest import mock
 import pytest
 
 from google.cloud.pubsub_v1.subscriber import futures
diff --git a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
index 1a52af231..3749e3a44 100644
--- a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
+++ b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
@@ -18,7 +18,7 @@
 from google.cloud.pubsub_v1.subscriber._protocol import heartbeater
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 
-import mock
+from unittest import mock
 import pytest
 
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
index 9ebd37f4f..06b14fcae 100644
--- a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
+++ b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 import queue
 
 from google.cloud.pubsub_v1.subscriber._protocol import helper_threads
diff --git a/tests/unit/pubsub_v1/subscriber/test_leaser.py b/tests/unit/pubsub_v1/subscriber/test_leaser.py
index 890c3c947..a19b48ad1 100644
--- a/tests/unit/pubsub_v1/subscriber/test_leaser.py
+++ b/tests/unit/pubsub_v1/subscriber/test_leaser.py
@@ -22,7 +22,7 @@
 from google.cloud.pubsub_v1.subscriber._protocol import requests
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 
-import mock
+from unittest import mock
 import pytest
 
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_message.py b/tests/unit/pubsub_v1/subscriber/test_message.py
index 0debabaf3..4751fc003 100644
--- a/tests/unit/pubsub_v1/subscriber/test_message.py
+++ b/tests/unit/pubsub_v1/subscriber/test_message.py
@@ -16,7 +16,7 @@
 import queue
 import time
 
-import mock
+from unittest import mock
 
 from google.api_core import datetime_helpers
 from google.cloud.pubsub_v1.subscriber import message
diff --git a/tests/unit/pubsub_v1/subscriber/test_scheduler.py b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
index 0545c967c..ba804cfd3 100644
--- a/tests/unit/pubsub_v1/subscriber/test_scheduler.py
+++ b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
@@ -18,7 +18,7 @@
 import time
 import warnings
 
-import mock
+from unittest import mock
 
 from google.cloud.pubsub_v1.subscriber import scheduler
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
index ad1647119..0628266c0 100644
--- a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
+++ b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
@@ -18,7 +18,7 @@
 import time
 import types as stdlib_types
 
-import mock
+from unittest import mock
 import pytest
 
 from google.api_core import bidi
diff --git a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
index 793ceca3c..e1fb9eca3 100644
--- a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
+++ b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
@@ -15,7 +15,7 @@
 import warnings
 
 import grpc
-import mock
+from unittest import mock
 import pytest
 
 from google.api_core.gapic_v1.client_info import METRICS_METADATA_KEY
diff --git a/tests/unit/pubsub_v1/test_futures.py b/tests/unit/pubsub_v1/test_futures.py
index 2b26289c4..b15e38d17 100644
--- a/tests/unit/pubsub_v1/test_futures.py
+++ b/tests/unit/pubsub_v1/test_futures.py
@@ -17,7 +17,7 @@
 import threading
 import time
 
-import mock
+from unittest import mock
 import pytest
 
 from google.cloud.pubsub_v1 import exceptions

From 9a36782522c7bca0a8278ea86dc738de15adf3e9 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Sat, 23 Jul 2022 16:37:06 -0400
Subject: [PATCH 02/61] remove changes from auto-generated files

---
 tests/unit/gapic/pubsub_v1/test_publisher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/gapic/pubsub_v1/test_publisher.py b/tests/unit/gapic/pubsub_v1/test_publisher.py
index 67778c09f..c5ab354d6 100644
--- a/tests/unit/gapic/pubsub_v1/test_publisher.py
+++ b/tests/unit/gapic/pubsub_v1/test_publisher.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-from unittest import mock
+import mock
 
 import grpc
 from grpc.experimental import aio

From 7ad0185d84fcdc280b1125d01cf1f6e9a1a55bd4 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Sat, 23 Jul 2022 16:38:39 -0400
Subject: [PATCH 03/61] remove changes from auto-generated files

---
 tests/unit/gapic/pubsub_v1/test_schema_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/gapic/pubsub_v1/test_schema_service.py b/tests/unit/gapic/pubsub_v1/test_schema_service.py
index e24e24936..852e4ef3b 100644
--- a/tests/unit/gapic/pubsub_v1/test_schema_service.py
+++ b/tests/unit/gapic/pubsub_v1/test_schema_service.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-from unittest import mock
+import mock
 
 import grpc
 from grpc.experimental import aio

From 103372f54ac2fcf4a63336f5303a18a794a6b919 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Sat, 23 Jul 2022 16:40:06 -0400
Subject: [PATCH 04/61] remove changes from auto-generated files

---
 tests/unit/gapic/pubsub_v1/test_subscriber.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/gapic/pubsub_v1/test_subscriber.py b/tests/unit/gapic/pubsub_v1/test_subscriber.py
index 0bd3594dd..b4f9b3882 100644
--- a/tests/unit/gapic/pubsub_v1/test_subscriber.py
+++ b/tests/unit/gapic/pubsub_v1/test_subscriber.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-from unittest import mock
+import mock
 import warnings
 
 import grpc

From 20af625cf4f62cff1c89cf560ca748df26af01f9 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:26:54 -0400
Subject: [PATCH 05/61] Update system.py

---
 tests/system.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/system.py b/tests/system.py
index abe49c39d..cadac3beb 100644
--- a/tests/system.py
+++ b/tests/system.py
@@ -23,7 +23,12 @@
 import threading
 import time
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 import google.auth

From 791fb37a908f8632ab9225ffebef014c14b89bae Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:27:26 -0400
Subject: [PATCH 06/61] Update conftest.py

---
 tests/unit/pubsub_v1/conftest.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/conftest.py b/tests/unit/pubsub_v1/conftest.py
index f81071146..362d14c31 100644
--- a/tests/unit/pubsub_v1/conftest.py
+++ b/tests/unit/pubsub_v1/conftest.py
@@ -13,7 +13,12 @@
 # limitations under the License.
 
 import google.auth.credentials
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 

From e985f2bf82131a7f286be1556c7c37cbb38d54c2 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:27:41 -0400
Subject: [PATCH 07/61] Update test_base.py

---
 tests/unit/pubsub_v1/publisher/batch/test_base.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/batch/test_base.py b/tests/unit/pubsub_v1/publisher/batch/test_base.py
index 359b584ae..9011a763e 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_base.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_base.py
@@ -14,7 +14,12 @@
 
 from __future__ import absolute_import
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 from google.auth import credentials
 from google.cloud.pubsub_v1 import publisher

From 5bbe2ad73c8610a00b9bc7c8e8dc906cc4f58e5d Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:54:38 -0400
Subject: [PATCH 08/61] Update test_thread.py

---
 tests/unit/pubsub_v1/publisher/batch/test_thread.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/batch/test_thread.py b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
index f32ecd4c3..3599b61db 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_thread.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
@@ -16,7 +16,12 @@
 import threading
 import time
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 import google.api_core.exceptions

From ee9c7d651a5f6160839ff321d44a92c6314f85b2 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:54:52 -0400
Subject: [PATCH 09/61] Update test_unordered_sequencer.py

---
 .../publisher/sequencer/test_unordered_sequencer.py        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
index ad597ab33..3007ed212 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
@@ -12,7 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 from google.auth import credentials

From 3e1bdd529e8870c3ccc23fe40dde8b4f69c144c9 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:55:13 -0400
Subject: [PATCH 10/61] Update test_publisher_client.py

---
 tests/unit/pubsub_v1/publisher/test_publisher_client.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
index aa5f01f81..3729f923b 100644
--- a/tests/unit/pubsub_v1/publisher/test_publisher_client.py
+++ b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -19,7 +19,12 @@
 
 import grpc
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 import time
 import warnings

From 64a53163cfd9e2ccbbdcac94a1bcba89fd87f677 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:55:25 -0400
Subject: [PATCH 11/61] Update test_dispatcher.py

---
 tests/unit/pubsub_v1/subscriber/test_dispatcher.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
index 07948fbf8..c707d188b 100644
--- a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
+++ b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
@@ -22,7 +22,12 @@
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 from google.cloud.pubsub_v1.subscriber import futures
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 from google.cloud.pubsub_v1.subscriber.exceptions import (
     AcknowledgeStatus,

From 7dcb5f3cdf4cc22aef6687bfd355116fe8063b63 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:55:36 -0400
Subject: [PATCH 12/61] Update test_futures_subscriber.py

---
 tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
index c4c539f96..fdaae7348 100644
--- a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
+++ b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
@@ -14,7 +14,12 @@
 
 from __future__ import absolute_import
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 from google.cloud.pubsub_v1.subscriber import futures

From dc5aaf38d7fd32cb83141c03b0e34b134c6b4ed7 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:55:45 -0400
Subject: [PATCH 13/61] Update test_heartbeater.py

---
 tests/unit/pubsub_v1/subscriber/test_heartbeater.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
index 3749e3a44..f7e0e431b 100644
--- a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
+++ b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
@@ -18,7 +18,12 @@
 from google.cloud.pubsub_v1.subscriber._protocol import heartbeater
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 

From f547bb72830647576c5c7f16d1abff7c20b1378c Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:56:00 -0400
Subject: [PATCH 14/61] Update test_helper_threads.py

---
 tests/unit/pubsub_v1/subscriber/test_helper_threads.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
index 06b14fcae..d4d2cc0f0 100644
--- a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
+++ b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
@@ -12,7 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import queue
 
 from google.cloud.pubsub_v1.subscriber._protocol import helper_threads

From b8e134b07c8955e14838181e6a1d37c4025fa7dc Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:56:10 -0400
Subject: [PATCH 15/61] Update test_leaser.py

---
 tests/unit/pubsub_v1/subscriber/test_leaser.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_leaser.py b/tests/unit/pubsub_v1/subscriber/test_leaser.py
index 5a3b42e04..cbbb24b31 100644
--- a/tests/unit/pubsub_v1/subscriber/test_leaser.py
+++ b/tests/unit/pubsub_v1/subscriber/test_leaser.py
@@ -22,7 +22,12 @@
 from google.cloud.pubsub_v1.subscriber._protocol import requests
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 

From 86efcae3b8e59c7d8d65d2d54c30f1ea80dcb701 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:56:19 -0400
Subject: [PATCH 16/61] Update test_message.py

---
 tests/unit/pubsub_v1/subscriber/test_message.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_message.py b/tests/unit/pubsub_v1/subscriber/test_message.py
index 4751fc003..e2cc9c9a5 100644
--- a/tests/unit/pubsub_v1/subscriber/test_message.py
+++ b/tests/unit/pubsub_v1/subscriber/test_message.py
@@ -16,7 +16,12 @@
 import queue
 import time
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 from google.api_core import datetime_helpers
 from google.cloud.pubsub_v1.subscriber import message

From 8b700f50eff495186f6e03f07ffb606c7e997465 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:00:12 -0400
Subject: [PATCH 17/61] Update test_scheduler.py

---
 tests/unit/pubsub_v1/subscriber/test_scheduler.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_scheduler.py b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
index ba804cfd3..c7406055a 100644
--- a/tests/unit/pubsub_v1/subscriber/test_scheduler.py
+++ b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
@@ -18,7 +18,12 @@
 import time
 import warnings
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 
 from google.cloud.pubsub_v1.subscriber import scheduler
 

From 44a7f981cdcea0afb10c3a0915dd827be6eadce8 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:00:21 -0400
Subject: [PATCH 18/61] Update test_streaming_pull_manager.py

---
 .../pubsub_v1/subscriber/test_streaming_pull_manager.py    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
index 7ccdec60c..a5e73d2ef 100644
--- a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
+++ b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
@@ -18,7 +18,12 @@
 import time
 import types as stdlib_types
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 from google.api_core import bidi

From feabd22987c5792cdc51404b0ee890281f750198 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:00:30 -0400
Subject: [PATCH 19/61] Update test_subscriber_client.py

---
 tests/unit/pubsub_v1/subscriber/test_subscriber_client.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
index e1fb9eca3..1b3e499f8 100644
--- a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
+++ b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
@@ -15,7 +15,12 @@
 import warnings
 
 import grpc
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 from google.api_core.gapic_v1.client_info import METRICS_METADATA_KEY

From 6100215410772cb0c1cb309d2faae89e4f491ec2 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:00:41 -0400
Subject: [PATCH 20/61] Update test_futures.py

---
 tests/unit/pubsub_v1/test_futures.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/test_futures.py b/tests/unit/pubsub_v1/test_futures.py
index b15e38d17..27fcd13c0 100644
--- a/tests/unit/pubsub_v1/test_futures.py
+++ b/tests/unit/pubsub_v1/test_futures.py
@@ -17,7 +17,12 @@
 import threading
 import time
 
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 from google.cloud.pubsub_v1 import exceptions

From 5f18dbc748420c4aab0d994239801aceae2b5ce0 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:00:59 -0400
Subject: [PATCH 21/61] Update test_ordered_sequencer.py

---
 .../publisher/sequencer/test_ordered_sequencer.py          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
index 16f034eb9..c3847e495 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
@@ -13,7 +13,12 @@
 # limitations under the License.
 
 import concurrent.futures as futures
-from unittest import mock
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+    from unittest.mock import AsyncMock
+except ImportError:
+    import mock
 import pytest
 
 from google.auth import credentials

From c3f5a284212209fdc1e5ab1c3b5e961bc67dd971 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 15:09:54 -0400
Subject: [PATCH 22/61] Update conftest.py

---
 tests/unit/pubsub_v1/conftest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/pubsub_v1/conftest.py b/tests/unit/pubsub_v1/conftest.py
index 362d14c31..253bb336f 100644
--- a/tests/unit/pubsub_v1/conftest.py
+++ b/tests/unit/pubsub_v1/conftest.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import google.auth.credentials
+
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock

From 762484b9ba871de12bfdeccd3679e24103ef1a47 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 15:53:50 -0400
Subject: [PATCH 23/61] Update test_subscriber_client.py

---
 tests/unit/pubsub_v1/subscriber/test_subscriber_client.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
index 1b3e499f8..c89cc4027 100644
--- a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
+++ b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
@@ -15,6 +15,7 @@
 import warnings
 
 import grpc
+
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock

From cde0720e339bf06dcfc1c7172e7d834a38807970 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 15:54:31 -0400
Subject: [PATCH 24/61] Update test_ordered_sequencer.py

---
 .../unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
index c3847e495..ea7c3444a 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import concurrent.futures as futures
+
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock

From 6a1edcb9f0d4db7b5040908381e4b456608eae51 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:23:58 -0400
Subject: [PATCH 25/61] Update system.py

---
 tests/system.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/system.py b/tests/system.py
index cadac3beb..e641f4e59 100644
--- a/tests/system.py
+++ b/tests/system.py
@@ -26,7 +26,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 8eaad4c0014803b376e488874489ff93a4d4b794 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:24:09 -0400
Subject: [PATCH 26/61] Update conftest.py

---
 tests/unit/pubsub_v1/conftest.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/conftest.py b/tests/unit/pubsub_v1/conftest.py
index 253bb336f..82f6a4c38 100644
--- a/tests/unit/pubsub_v1/conftest.py
+++ b/tests/unit/pubsub_v1/conftest.py
@@ -17,7 +17,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 814311416b3c01849882d11e98ae6e7255e2aae4 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:25:15 -0400
Subject: [PATCH 27/61] Update test_base.py

---
 tests/unit/pubsub_v1/publisher/batch/test_base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/batch/test_base.py b/tests/unit/pubsub_v1/publisher/batch/test_base.py
index 9011a763e..d05dc7dfd 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_base.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_base.py
@@ -17,7 +17,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 

From ad17216a64475c3f5667237a00b5249b1240f543 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:25:27 -0400
Subject: [PATCH 28/61] Update test_thread.py

---
 tests/unit/pubsub_v1/publisher/batch/test_thread.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/batch/test_thread.py b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
index 3599b61db..4d9c16ce9 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_thread.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
@@ -19,7 +19,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From ae5013f7825f2e24e9e34a379ac682f426aaff0e Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:25:45 -0400
Subject: [PATCH 29/61] Update test_ordered_sequencer.py

---
 .../unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
index ea7c3444a..3e4c59c86 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
@@ -17,7 +17,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 5663032b1f14e89f676990efdc5540b10a9589d5 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:26:02 -0400
Subject: [PATCH 30/61] Update test_unordered_sequencer.py

---
 .../pubsub_v1/publisher/sequencer/test_unordered_sequencer.py    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
index 3007ed212..2cc82dd81 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
@@ -15,7 +15,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From deea188c5543122f498007840db3951d985c5963 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:26:19 -0400
Subject: [PATCH 31/61] Update test_publisher_client.py

---
 tests/unit/pubsub_v1/publisher/test_publisher_client.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
index 3729f923b..2744faee0 100644
--- a/tests/unit/pubsub_v1/publisher/test_publisher_client.py
+++ b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -22,7 +22,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 79be28b7e715736b8b7cd0f14d01f9c44598cc5b Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:26:35 -0400
Subject: [PATCH 32/61] Update test_dispatcher.py

---
 tests/unit/pubsub_v1/subscriber/test_dispatcher.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
index c707d188b..0c0f04d7d 100644
--- a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
+++ b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
@@ -25,7 +25,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From fd6f34d6dc59c481aa19c8abb7df292fa77295f0 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:26:47 -0400
Subject: [PATCH 33/61] Update test_futures_subscriber.py

---
 tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
index fdaae7348..4f5ce7c3e 100644
--- a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
+++ b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
@@ -17,7 +17,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 98f19f86aad4a8d07c55e8a5b36927af9b97706c Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:27:00 -0400
Subject: [PATCH 34/61] Update test_heartbeater.py

---
 tests/unit/pubsub_v1/subscriber/test_heartbeater.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
index f7e0e431b..2a18a31b8 100644
--- a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
+++ b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
@@ -21,7 +21,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 799fbd4163ec084c47b686096566ebf8fe091b44 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:27:14 -0400
Subject: [PATCH 35/61] Update test_helper_threads.py

---
 tests/unit/pubsub_v1/subscriber/test_helper_threads.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
index d4d2cc0f0..21b2d924f 100644
--- a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
+++ b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
@@ -15,7 +15,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import queue

From b1213560c041940ce3cefd10643cba4f1b125759 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:27:27 -0400
Subject: [PATCH 36/61] Update test_leaser.py

---
 tests/unit/pubsub_v1/subscriber/test_leaser.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_leaser.py b/tests/unit/pubsub_v1/subscriber/test_leaser.py
index cbbb24b31..49190038d 100644
--- a/tests/unit/pubsub_v1/subscriber/test_leaser.py
+++ b/tests/unit/pubsub_v1/subscriber/test_leaser.py
@@ -25,7 +25,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 0896e4a9bfa59ef8699791af9c0114a603cb0009 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 16:27:38 -0400
Subject: [PATCH 37/61] Update test_message.py

---
 tests/unit/pubsub_v1/subscriber/test_message.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_message.py b/tests/unit/pubsub_v1/subscriber/test_message.py
index e2cc9c9a5..a7b213a97 100644
--- a/tests/unit/pubsub_v1/subscriber/test_message.py
+++ b/tests/unit/pubsub_v1/subscriber/test_message.py
@@ -19,7 +19,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 

From 7a49df511e2cc0f9f357ae0b0d8d3319b598e7f8 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Fri, 5 Aug 2022 11:49:18 -0400
Subject: [PATCH 38/61] Update test_futures.py

---
 tests/unit/pubsub_v1/test_futures.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/test_futures.py b/tests/unit/pubsub_v1/test_futures.py
index 27fcd13c0..8f49378d2 100644
--- a/tests/unit/pubsub_v1/test_futures.py
+++ b/tests/unit/pubsub_v1/test_futures.py
@@ -20,7 +20,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 69f29c4dc3481e5d929b7def683286ddf1cad5ea Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Fri, 5 Aug 2022 11:49:38 -0400
Subject: [PATCH 39/61] Update test_scheduler.py

---
 tests/unit/pubsub_v1/subscriber/test_scheduler.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_scheduler.py b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
index c7406055a..c96c3ec51 100644
--- a/tests/unit/pubsub_v1/subscriber/test_scheduler.py
+++ b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
@@ -21,7 +21,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 

From dda2882bab4fd27944ae6397f1cd18dd66b78dbb Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Fri, 5 Aug 2022 11:50:07 -0400
Subject: [PATCH 40/61] Update test_streaming_pull_manager.py

---
 tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
index a5e73d2ef..a09ea7e30 100644
--- a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
+++ b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
@@ -21,7 +21,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From d75c1b73979dcc08a9b5e8b9520a797bb1daa3c1 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Fri, 5 Aug 2022 11:50:22 -0400
Subject: [PATCH 41/61] Update test_subscriber_client.py

---
 tests/unit/pubsub_v1/subscriber/test_subscriber_client.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
index c89cc4027..c1e981e89 100644
--- a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
+++ b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
@@ -19,7 +19,6 @@
 # try/except added for compatibility with python < 3.8
 try:
     from unittest import mock
-    from unittest.mock import AsyncMock
 except ImportError:
     import mock
 import pytest

From 623991b1601debdc0b85527add05d9026af45db9 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 17:47:38 -0400
Subject: [PATCH 42/61] Special case python < 3.8

---
 tests/unit/pubsub_v1/subscriber/test_dispatcher.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
index 0c0f04d7d..d7360b173 100644
--- a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
+++ b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
@@ -14,6 +14,7 @@
 
 import collections
 import queue
+import sys
 import threading
 
 from google.cloud.pubsub_v1.subscriber._protocol import dispatcher
@@ -22,11 +23,12 @@
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 from google.cloud.pubsub_v1.subscriber import futures
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info < 3.8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 from google.cloud.pubsub_v1.subscriber.exceptions import (
     AcknowledgeStatus,

From dff4fba0fcf0c060f00a616615494dfcbfd6da9d Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:02:32 -0400
Subject: [PATCH 43/61] Update test_dispatcher.py

---
 tests/unit/pubsub_v1/subscriber/test_dispatcher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
index d7360b173..91ee2a66d 100644
--- a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
+++ b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
@@ -24,7 +24,7 @@
 from google.cloud.pubsub_v1.subscriber import futures
 
 # special case python < 3.8
-if sys.version_info < 3.8:
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
 else:
     from unittest import mock

From 1c821517c81d2425872f188527ff19f3fc44e223 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:08:45 -0400
Subject: [PATCH 44/61] Update test_streaming_pull_manager.py

---
 .../pubsub_v1/subscriber/test_streaming_pull_manager.py  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
index bdf6c96b8..459ab6d67 100644
--- a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
+++ b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
@@ -14,15 +14,16 @@
 
 import functools
 import logging
+import sys
 import threading
 import time
 import types as stdlib_types
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
 import pytest
 
 from google.api_core import bidi

From 839b2571d2cf99357c06a7faf0a11836e940bbe7 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:11:05 -0400
Subject: [PATCH 45/61] Update test_publisher_client.py

---
 tests/unit/pubsub_v1/publisher/test_publisher_client.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
index 2744faee0..b10deb158 100644
--- a/tests/unit/pubsub_v1/publisher/test_publisher_client.py
+++ b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -19,11 +19,12 @@
 
 import grpc
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 import time
 import warnings

From ea8eb59e4db27ba7e0299702220b6d1dc0f871ac Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:11:35 -0400
Subject: [PATCH 46/61] Update system.py

---
 tests/system.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/system.py b/tests/system.py
index e641f4e59..44444325f 100644
--- a/tests/system.py
+++ b/tests/system.py
@@ -20,14 +20,16 @@
 import operator as op
 import os
 import psutil
+import sys
 import threading
 import time
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 import google.auth

From 8b1200dffef0d9eefc7e858107e0ca9109488fb7 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:11:55 -0400
Subject: [PATCH 47/61] Update conftest.py

---
 tests/unit/pubsub_v1/conftest.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/conftest.py b/tests/unit/pubsub_v1/conftest.py
index 82f6a4c38..e39832d5f 100644
--- a/tests/unit/pubsub_v1/conftest.py
+++ b/tests/unit/pubsub_v1/conftest.py
@@ -11,14 +11,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import sys
 
 import google.auth.credentials
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 

From 495c0d57bd27a6c496bf1fb7b4aac779880b8cf3 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:12:30 -0400
Subject: [PATCH 48/61] Update test_base.py

---
 tests/unit/pubsub_v1/publisher/batch/test_base.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/publisher/batch/test_base.py b/tests/unit/pubsub_v1/publisher/batch/test_base.py
index d05dc7dfd..c35f482e7 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_base.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_base.py
@@ -13,12 +13,13 @@
 # limitations under the License.
 
 from __future__ import absolute_import
+import sys
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
 
 from google.auth import credentials
 from google.cloud.pubsub_v1 import publisher

From 86302bf2b617fa3da1ce70fddf53c9839a9b816e Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:13:01 -0400
Subject: [PATCH 49/61] Update test_thread.py

---
 tests/unit/pubsub_v1/publisher/batch/test_thread.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/publisher/batch/test_thread.py b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
index 4d9c16ce9..60658b4ce 100644
--- a/tests/unit/pubsub_v1/publisher/batch/test_thread.py
+++ b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
@@ -13,14 +13,16 @@
 # limitations under the License.
 
 import datetime
+import sys
 import threading
 import time
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 import google.api_core.exceptions

From 035ac5dd3f7c232489a15bc21eb0dcc61cf8aad8 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:13:36 -0400
Subject: [PATCH 50/61] Update test_ordered_sequencer.py

---
 .../publisher/sequencer/test_ordered_sequencer.py      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
index 3e4c59c86..e126c829f 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
@@ -13,12 +13,14 @@
 # limitations under the License.
 
 import concurrent.futures as futures
+import sys
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 from google.auth import credentials

From 3768d259581390ad5930ee9e2f2ba59d6407b4f8 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:13:51 -0400
Subject: [PATCH 51/61] Update test_unordered_sequencer.py

---
 .../publisher/sequencer/test_unordered_sequencer.py    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
index 2cc82dd81..40e8c7e41 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
@@ -11,13 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import sys
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
-import pytest
+else:
+    from unittest import mock
 
 from google.auth import credentials
 from google.cloud.pubsub_v1 import publisher

From 50fd4cda03212bfc42432f6e4b413888203f7384 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:14:10 -0400
Subject: [PATCH 52/61] Update test_publisher_client.py

---
 tests/unit/pubsub_v1/publisher/test_publisher_client.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
index b10deb158..6c68c3943 100644
--- a/tests/unit/pubsub_v1/publisher/test_publisher_client.py
+++ b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -16,6 +16,7 @@
 from __future__ import division
 
 import inspect
+import sys
 
 import grpc
 

From 817137d86ef281c94cee246146bcf3d64ac7c7c9 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:14:33 -0400
Subject: [PATCH 53/61] Update test_futures_subscriber.py

---
 .../pubsub_v1/subscriber/test_futures_subscriber.py    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
index 4f5ce7c3e..d10da6fb1 100644
--- a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
+++ b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
@@ -13,12 +13,14 @@
 # limitations under the License.
 
 from __future__ import absolute_import
+import sys
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 from google.cloud.pubsub_v1.subscriber import futures

From 945c49774cff90ea9ad5d952356e4c98216c3898 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:16:05 -0400
Subject: [PATCH 54/61] Update test_heartbeater.py

---
 tests/unit/pubsub_v1/subscriber/test_heartbeater.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
index 2a18a31b8..503fde2c9 100644
--- a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
+++ b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
@@ -13,16 +13,18 @@
 # limitations under the License.
 
 import logging
+import sys
 import threading
 
 from google.cloud.pubsub_v1.subscriber._protocol import heartbeater
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 

From 2dd867a266f6abea58d28a1c345d5b571b711d59 Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:16:38 -0400
Subject: [PATCH 55/61] Update test_helper_threads.py

---
 .../unit/pubsub_v1/subscriber/test_helper_threads.py  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
index 21b2d924f..bfbaf3e56 100644
--- a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
+++ b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
@@ -12,11 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+import sys
+
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import queue
 
 from google.cloud.pubsub_v1.subscriber._protocol import helper_threads

From 1dd70d8858a600bedfb4f5a5cc35c323f4ba915b Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:16:58 -0400
Subject: [PATCH 56/61] Update test_leaser.py

---
 tests/unit/pubsub_v1/subscriber/test_leaser.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_leaser.py b/tests/unit/pubsub_v1/subscriber/test_leaser.py
index 49190038d..7e11e3ccb 100644
--- a/tests/unit/pubsub_v1/subscriber/test_leaser.py
+++ b/tests/unit/pubsub_v1/subscriber/test_leaser.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import logging
+import sys
 import threading
 
 from google.cloud.pubsub_v1 import types
@@ -22,11 +23,12 @@
 from google.cloud.pubsub_v1.subscriber._protocol import requests
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 

From 72af14e601446d4317428339a951059711bcaeff Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:17:12 -0400
Subject: [PATCH 57/61] Update test_message.py

---
 tests/unit/pubsub_v1/subscriber/test_message.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_message.py b/tests/unit/pubsub_v1/subscriber/test_message.py
index a7b213a97..49b07b7fd 100644
--- a/tests/unit/pubsub_v1/subscriber/test_message.py
+++ b/tests/unit/pubsub_v1/subscriber/test_message.py
@@ -14,13 +14,14 @@
 
 import datetime
 import queue
+import sys
 import time
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
 
 from google.api_core import datetime_helpers
 from google.cloud.pubsub_v1.subscriber import message

From 66d0cfd6d9ced43f2d30969a33190a6098dd631b Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:17:33 -0400
Subject: [PATCH 58/61] Update test_scheduler.py

---
 tests/unit/pubsub_v1/subscriber/test_scheduler.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_scheduler.py b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
index c96c3ec51..ff76fa09d 100644
--- a/tests/unit/pubsub_v1/subscriber/test_scheduler.py
+++ b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
@@ -14,15 +14,16 @@
 
 import concurrent.futures
 import queue
+import sys
 import threading
 import time
 import warnings
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
 
 from google.cloud.pubsub_v1.subscriber import scheduler
 

From 2d2b65c24e57183bc078f80cbdfd33ededd5dabe Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:17:53 -0400
Subject: [PATCH 59/61] Update test_subscriber_client.py

---
 .../pubsub_v1/subscriber/test_subscriber_client.py     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
index c1e981e89..83ef3f06d 100644
--- a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
+++ b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
@@ -12,15 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 import warnings
 
 import grpc
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 from google.api_core.gapic_v1.client_info import METRICS_METADATA_KEY

From 92dfb96cd14cb7e78c0c5aedcb425e32caddc75e Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:18:09 -0400
Subject: [PATCH 60/61] Update test_futures.py

---
 tests/unit/pubsub_v1/test_futures.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pubsub_v1/test_futures.py b/tests/unit/pubsub_v1/test_futures.py
index 8f49378d2..5a4dad41a 100644
--- a/tests/unit/pubsub_v1/test_futures.py
+++ b/tests/unit/pubsub_v1/test_futures.py
@@ -17,11 +17,12 @@
 import threading
 import time
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:
+# special case python < 3.8
+if sys.version_info.major == 3 and sys.version_info.minor < 8:
     import mock
+else:
+    from unittest import mock
+
 import pytest
 
 from google.cloud.pubsub_v1 import exceptions

From 33f2d1cdbbc5d130091dd32e929d7a0058a4cd4c Mon Sep 17 00:00:00 2001
From: Anna Cocuzzo <63511057+acocuzzo@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:19:59 -0400
Subject: [PATCH 61/61] Update test_unordered_sequencer.py

---
 .../pubsub_v1/publisher/sequencer/test_unordered_sequencer.py   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
index 40e8c7e41..8a2c486ad 100644
--- a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
+++ b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
@@ -19,6 +19,8 @@
 else:
     from unittest import mock
 
+import pytest
+
 from google.auth import credentials
 from google.cloud.pubsub_v1 import publisher
 from google.cloud.pubsub_v1 import types