From 878b2039c913be3066c49945b9b5960d09001395 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 16 Nov 2018 15:36:53 -0500 Subject: [PATCH 1/2] Suppress deprecation warnings for 'assertRaisesRegexp'. --- firestore/tests/unit/test_order.py | 8 ++++++-- firestore/tests/unit/test_query.py | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/firestore/tests/unit/test_order.py b/firestore/tests/unit/test_order.py index 9f1017b8807d..1178030368f3 100644 --- a/firestore/tests/unit/test_order.py +++ b/firestore/tests/unit/test_order.py @@ -27,6 +27,10 @@ class TestOrder(unittest.TestCase): + + if six.PY2: + assertRaisesRegex = TestCase.assertRaisesRegexp + @staticmethod def _get_target_class(): from google.cloud.firestore_v1beta1.order import Order @@ -175,7 +179,7 @@ def test_typeorder_type_failure(self): left = mock.Mock() left.WhichOneof.return_value = "imaginary-type" - with self.assertRaisesRegexp(ValueError, "Could not detect value"): + with self.assertRaisesRegex(ValueError, "Could not detect value"): target.compare(left, mock.Mock()) def test_failure_to_find_type(self): @@ -187,7 +191,7 @@ def test_failure_to_find_type(self): # expect this to fail with value error. with mock.patch.object(TypeOrder, 'from_value',) as to: to.value = None - with self.assertRaisesRegexp( + with self.assertRaisesRegex( ValueError, "'Unknown ``value_type``" ): target.compare(left, right) diff --git a/firestore/tests/unit/test_query.py b/firestore/tests/unit/test_query.py index 79bc5260822e..9461c4c8971d 100644 --- a/firestore/tests/unit/test_query.py +++ b/firestore/tests/unit/test_query.py @@ -17,10 +17,14 @@ import unittest import mock +import six class TestQuery(unittest.TestCase): + if six.PY2: + assertRaisesRegex = TestCase.assertRaisesRegexp + @staticmethod def _get_target_class(): from google.cloud.firestore_v1beta1.query import Query @@ -943,8 +947,7 @@ def test_comparator_missing_order_by_field_in_data_raises(self): doc2._data = {'first': {'stringValue': 'Ada'}, 'last': {'stringValue': 'lovelace'}} - with self.assertRaisesRegexp(ValueError, - "Can only compare fields "): + with self.assertRaisesRegex(ValueError, "Can only compare fields "): query._comparator(doc1, doc2) From ef35726c4d403fbfe936029991e490d24846d39e Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 16 Nov 2018 16:34:09 -0500 Subject: [PATCH 2/2] Fix Py2.7 compat shim. --- firestore/tests/unit/test_order.py | 2 +- firestore/tests/unit/test_query.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/firestore/tests/unit/test_order.py b/firestore/tests/unit/test_order.py index 1178030368f3..71f411e2c2d7 100644 --- a/firestore/tests/unit/test_order.py +++ b/firestore/tests/unit/test_order.py @@ -29,7 +29,7 @@ class TestOrder(unittest.TestCase): if six.PY2: - assertRaisesRegex = TestCase.assertRaisesRegexp + assertRaisesRegex = unittest.TestCase.assertRaisesRegexp @staticmethod def _get_target_class(): diff --git a/firestore/tests/unit/test_query.py b/firestore/tests/unit/test_query.py index 9461c4c8971d..29ca334123ba 100644 --- a/firestore/tests/unit/test_query.py +++ b/firestore/tests/unit/test_query.py @@ -23,7 +23,7 @@ class TestQuery(unittest.TestCase): if six.PY2: - assertRaisesRegex = TestCase.assertRaisesRegexp + assertRaisesRegex = unittest.TestCase.assertRaisesRegexp @staticmethod def _get_target_class():