From 8ce3c1affaac76a3caa458e8e0f4e4bdaf691b79 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 5 Jul 2023 16:39:50 -0400 Subject: [PATCH] test: compatibility with proto-plus 1.22.3 (#733) --- tests/unit/v1/test_cross_language.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/unit/v1/test_cross_language.py b/tests/unit/v1/test_cross_language.py index e9663b544..84ae0c294 100644 --- a/tests/unit/v1/test_cross_language.py +++ b/tests/unit/v1/test_cross_language.py @@ -20,6 +20,8 @@ import mock import pytest +import proto as proto_plus + from google.cloud.firestore_v1.types import document from google.cloud.firestore_v1.types import firestore from google.cloud.firestore_v1.types import write @@ -244,7 +246,10 @@ def callback(keys, applied_changes, read_time): watch = Watch.for_query(query, callback, DocumentSnapshot) wrapped_responses = [ - firestore.ListenResponse.wrap(proto) for proto in testcase.responses + firestore.ListenResponse.wrap(proto._pb) + if isinstance(proto, proto_plus.Message) + else firestore.ListenResponse.wrap(proto) + for proto in testcase.responses ] if testcase.is_error: try: @@ -336,10 +341,15 @@ def convert_set_option(option): def convert_precondition(precond): from google.cloud.firestore_v1 import Client - if precond.HasField("exists"): + if isinstance(precond, proto_plus.Message): + precond_pb = precond._pb + else: + precond_pb = precond + + if precond_pb.HasField("exists"): return Client.write_option(exists=precond.exists) - assert precond.HasField("update_time") + assert precond_pb.HasField("update_time") return Client.write_option(last_update_time=precond.update_time)