Skip to content

Commit 5b5539f

Browse files
committed
Revert to assertRaisesRegexp for temporary python 2 compatibility
1 parent 4bea519 commit 5b5539f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

test/ModificationTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_capture_error_167(self):
3939
'test/mocks/'
4040
'capture-error-167'
4141
'.json')
42-
self.assertRaisesRegex(
42+
self.assertRaisesRegexp(
4343
Adyen.AdyenAPICommunicationError,
4444
"Unexpected error",
4545
self.ady.payment.capture,

test/PaymentTest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def test_error_401_mocked(self):
194194
'authorise'
195195
'-error-'
196196
'010.json')
197-
self.assertRaisesRegex(Adyen.AdyenAPIAuthenticationError,
197+
self.assertRaisesRegexp(Adyen.AdyenAPIAuthenticationError,
198198
"Unable to authenticate with Adyen's Servers."
199199
" Please verify the credentials set with the"
200200
" Adyen base class. Please reach out to your"
@@ -389,7 +389,7 @@ def test_error_401_mocked(self):
389389
'authorise'
390390
'-error-'
391391
'010.json')
392-
self.assertRaisesRegex(Adyen.AdyenAPIAuthenticationError,
392+
self.assertRaisesRegexp(Adyen.AdyenAPIAuthenticationError,
393393
"Unable to authenticate with Adyen's Servers."
394394
" Please verify the credentials set with the"
395395
" Adyen base class. Please reach out to your"

test/RecurringTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def test_disable_803(self):
6363
'recurring/'
6464
'disable-error-803'
6565
'.json')
66-
self.assertRaisesRegex(
66+
self.assertRaisesRegexp(
6767
Adyen.AdyenAPICommunicationError,
6868
"Unexpected error",
6969
self.ady.recurring.disable,

test/ThirdPartyPayoutTest.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def test_confirm_missing_reference(self):
4040
}
4141
resp = 'test/mocks/payout/confirm-missing-reference.json'
4242
self.ady.client = self.test.create_client_from_file(500, request, resp)
43-
self.assertRaisesRegex(
43+
self.assertRaisesRegexp(
4444
Adyen.AdyenAPIValidationError,
4545
"Received validation error with errorCode: 702,"
4646
" message: Required field 'merchantAccount' is null,"
@@ -68,7 +68,7 @@ def test_decline_missing_reference(self):
6868
}
6969
resp = 'test/mocks/payout/decline-missing-reference.json'
7070
self.ady.client = self.test.create_client_from_file(500, request, resp)
71-
self.assertRaisesRegex(
71+
self.assertRaisesRegexp(
7272
Adyen.AdyenAPIValidationError,
7373
"Received validation error with errorCode: 702,"
7474
" message: Required field 'merchantAccount' is null,"
@@ -140,7 +140,7 @@ def test_submit_invalid_recurring_reference(self):
140140
}
141141
resp = 'test/mocks/payout/submit-invalid-reference.json'
142142
self.ady.client = self.test.create_client_from_file(422, request, resp)
143-
self.assertRaisesRegex(
143+
self.assertRaisesRegexp(
144144
Adyen.AdyenAPICommunicationError,
145145
"Unexpected error",
146146
self.ady.payout.submit,
@@ -169,7 +169,7 @@ def test_store_detail_and_submit_missing_reference(self):
169169
resp = 'test/mocks/payout/submit-missing-reference.json'
170170
self.ady.client = self.test.create_client_from_file(422, request, resp)
171171

172-
self.assertRaisesRegex(
172+
self.assertRaisesRegexp(
173173
Adyen.AdyenAPICommunicationError,
174174
"Unexpected error",
175175
self.ady.payout.store_detail_and_submit,
@@ -192,7 +192,7 @@ def test_store_detail_and_submit_missing_payment(self):
192192
}
193193
resp = 'test/mocks/payout/storeDetailAndSubmit-missing-payment.json'
194194
self.ady.client = self.test.create_client_from_file(422, request, resp)
195-
self.assertRaisesRegex(
195+
self.assertRaisesRegexp(
196196
Adyen.AdyenAPICommunicationError,
197197
"Unexpected error",
198198
self.ady.payout.store_detail_and_submit,
@@ -220,7 +220,7 @@ def test_store_detail_and_submit_invalid_iban(self):
220220
}
221221
resp = 'test/mocks/payout/storeDetailAndSubmit-invalid-iban.json'
222222
self.ady.client = self.test.create_client_from_file(422, request, resp)
223-
self.assertRaisesRegex(
223+
self.assertRaisesRegexp(
224224
Adyen.AdyenAPICommunicationError,
225225
"Unexpected error",
226226
self.ady.payout.store_detail_and_submit,

0 commit comments

Comments
 (0)