Skip to content

Commit 2e6b53a

Browse files
committed
Updated Tests and recordings
1 parent 07ee6bf commit 2e6b53a

File tree

5 files changed

+51
-25
lines changed

5 files changed

+51
-25
lines changed

sdk/communication/azure-communication-phonenumbers/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/communication/azure-communication-phonenumbers",
5-
"Tag": "python/communication/azure-communication-phonenumbers_e87531dfe4"
5+
"Tag": "python/communication/azure-communication-phonenumbers_233e7cbdc7"
66
}

sdk/communication/azure-communication-phonenumbers/azure/communication/phonenumbers/_phone_numbers_client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ def begin_purchase_phone_numbers(
119119
"""
120120
purchase_request = PhoneNumberPurchaseRequest(
121121
search_id=search_id,
122-
consent_to_not_resell_numbers=consent_to_not_resell_numbers)
122+
consent_to_not_resell_numbers=
123+
consent_to_not_resell_numbers
124+
)
123125

124126
polling_interval = kwargs.pop(
125127
'polling_interval', _DEFAULT_POLLING_INTERVAL_IN_SECONDS)

sdk/communication/azure-communication-phonenumbers/test/test_phone_number_administration_client.py

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def test_search_available_phone_numbers_from_managed_identity(self, **kwargs):
101101
phone_number_client = self._get_managed_identity_phone_number_client()
102102
capabilities = PhoneNumberCapabilities(
103103
calling=PhoneNumberCapabilityType.INBOUND,
104-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
104+
sms=PhoneNumberCapabilityType.NONE
105105
)
106106
poller = phone_number_client.begin_search_available_phone_numbers(
107107
self.country_code,
@@ -117,7 +117,7 @@ def test_search_available_phone_numbers_from_managed_identity(self, **kwargs):
117117
def test_search_available_phone_numbers(self, **kwargs):
118118
capabilities = PhoneNumberCapabilities(
119119
calling=PhoneNumberCapabilityType.INBOUND,
120-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
120+
sms=PhoneNumberCapabilityType.NONE
121121
)
122122
poller = self.phone_number_client.begin_search_available_phone_numbers(
123123
self.country_code,
@@ -136,7 +136,7 @@ def test_update_phone_number_capabilities_from_managed_identity(self, **kwargs):
136136
current_phone_number = phone_number_client.get_purchased_phone_number(
137137
self.phone_number)
138138
calling_capabilities = PhoneNumberCapabilityType.INBOUND if current_phone_number.capabilities.calling == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
139-
sms_capabilities = PhoneNumberCapabilityType.INBOUND_OUTBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
139+
sms_capabilities = PhoneNumberCapabilityType.INBOUND_OUTBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.NONE
140140
poller = phone_number_client.begin_update_phone_number_capabilities(
141141
self.phone_number,
142142
sms_capabilities,
@@ -153,7 +153,7 @@ def test_update_phone_number_capabilities(self, **kwargs):
153153
current_phone_number = self.phone_number_client.get_purchased_phone_number(
154154
self.phone_number)
155155
calling_capabilities = PhoneNumberCapabilityType.INBOUND if current_phone_number.capabilities.calling == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
156-
sms_capabilities = PhoneNumberCapabilityType.INBOUND_OUTBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
156+
sms_capabilities = PhoneNumberCapabilityType.INBOUND_OUTBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.NONE
157157
poller = self.phone_number_client.begin_update_phone_number_capabilities(
158158
self.phone_number,
159159
sms_capabilities,
@@ -168,11 +168,11 @@ def test_update_phone_number_capabilities(self, **kwargs):
168168
def test_purchase_phone_number_from_managed_identity(self, **kwargs):
169169
phone_number_client = self._get_managed_identity_phone_number_client()
170170
capabilities = PhoneNumberCapabilities(
171-
calling=PhoneNumberCapabilityType.INBOUND,
172-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
171+
calling=PhoneNumberCapabilityType.OUTBOUND,
172+
sms=PhoneNumberCapabilityType.NONE
173173
)
174174
search_poller = phone_number_client.begin_search_available_phone_numbers(
175-
self.country_code,
175+
"CA",
176176
PhoneNumberType.TOLL_FREE,
177177
PhoneNumberAssignmentType.APPLICATION,
178178
capabilities,
@@ -194,10 +194,10 @@ def test_purchase_phone_number_from_managed_identity(self, **kwargs):
194194
def test_purchase_phone_numbers(self, **kwargs):
195195
capabilities = PhoneNumberCapabilities(
196196
calling=PhoneNumberCapabilityType.INBOUND,
197-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
197+
sms=PhoneNumberCapabilityType.NONE
198198
)
199199
search_poller = self.phone_number_client.begin_search_available_phone_numbers(
200-
self.country_code,
200+
"CA",
201201
PhoneNumberType.TOLL_FREE,
202202
PhoneNumberAssignmentType.APPLICATION,
203203
capabilities,
@@ -219,10 +219,10 @@ def test_purchase_phone_numbers(self, **kwargs):
219219
def test_purchase_phone_numbers_dnr(self, **kwargs):
220220
capabilities = PhoneNumberCapabilities(
221221
calling=PhoneNumberCapabilityType.INBOUND,
222-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
222+
sms=PhoneNumberCapabilityType.NONE
223223
)
224224
search_poller = self.phone_number_client.begin_search_available_phone_numbers(
225-
"IT",
225+
"US",
226226
PhoneNumberType.TOLL_FREE,
227227
PhoneNumberAssignmentType.APPLICATION,
228228
capabilities,
@@ -239,6 +239,30 @@ def test_purchase_phone_numbers_dnr(self, **kwargs):
239239
release_poller.result()
240240
assert release_poller.status() == PhoneNumberOperationStatus.SUCCEEDED.value
241241

242+
@pytest.mark.skipif(SKIP_PURCHASE_PHONE_NUMBER_TESTS, reason=PURCHASE_PHONE_NUMBER_TEST_SKIP_REASON)
243+
@recorded_by_proxy
244+
def test_purchasefail_phone_numbers_dnr_no_consent_provided(self, **kwargs):
245+
capabilities = PhoneNumberCapabilities(
246+
calling=PhoneNumberCapabilityType.INBOUND,
247+
sms=PhoneNumberCapabilityType.NONE
248+
)
249+
search_poller = self.phone_number_client.begin_search_available_phone_numbers(
250+
"US",
251+
PhoneNumberType.TOLL_FREE,
252+
PhoneNumberAssignmentType.APPLICATION,
253+
capabilities,
254+
polling=True
255+
)
256+
phone_number_to_buy = search_poller.result()
257+
258+
with pytest.raises(Exception) as ex:
259+
self.phone_number_client.begin_purchase_phone_numbers(
260+
phone_number_to_buy.search_id, consent_to_not_resell_numbers=False, polling=True)
261+
# purchase_poller.result()
262+
# assert purchase_poller.status() == PhoneNumberOperationStatus.FAILED.value
263+
assert is_client_error_status_code(
264+
ex.value.status_code) is True, 'Status code {ex.value.status_code} does not indicate a client error' # type: ignore
265+
assert ex.value.message is not None # type: ignore
242266

243267
@recorded_by_proxy
244268
def test_get_purchased_phone_number_with_invalid_phone_number(self, **kwargs):

sdk/communication/azure-communication-phonenumbers/test/test_phone_number_administration_client_async.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from azure.communication.phonenumbers._shared.utils import parse_connection_str
1818
from phone_numbers_testcase import PhoneNumbersTestCase
1919

20-
SKIP_PURCHASE_PHONE_NUMBER_TESTS = True
20+
SKIP_PURCHASE_PHONE_NUMBER_TESTS = False
2121
PURCHASE_PHONE_NUMBER_TEST_SKIP_REASON = "Phone numbers shouldn't be purchased in live tests"
2222

2323
SKIP_INT_PHONE_NUMBER_TESTS = os.getenv(
@@ -146,7 +146,7 @@ async def test_update_phone_number_capabilities(self):
146146
async with self.phone_number_client:
147147
current_phone_number = await self.phone_number_client.get_purchased_phone_number(self.phone_number)
148148
calling_capabilities = PhoneNumberCapabilityType.INBOUND if current_phone_number.capabilities.calling == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
149-
sms_capabilities = PhoneNumberCapabilityType.INBOUND_OUTBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
149+
sms_capabilities = PhoneNumberCapabilityType.INBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.NONE
150150
poller = await self.phone_number_client.begin_update_phone_number_capabilities(
151151
self.phone_number,
152152
sms_capabilities,
@@ -164,7 +164,7 @@ async def test_update_phone_number_capabilities_from_managed_identity(self):
164164
async with phone_number_client:
165165
current_phone_number = await phone_number_client.get_purchased_phone_number(self.phone_number)
166166
calling_capabilities = PhoneNumberCapabilityType.INBOUND if current_phone_number.capabilities.calling == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
167-
sms_capabilities = PhoneNumberCapabilityType.INBOUND_OUTBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.OUTBOUND
167+
sms_capabilities = PhoneNumberCapabilityType.INBOUND_OUTBOUND if current_phone_number.capabilities.sms == PhoneNumberCapabilityType.OUTBOUND else PhoneNumberCapabilityType.NONE
168168
poller = await phone_number_client.begin_update_phone_number_capabilities(
169169
self.phone_number,
170170
sms_capabilities,
@@ -180,11 +180,11 @@ async def test_purchase_phone_numbers_from_managed_identity(self):
180180
phone_number_client = self._get_managed_identity_phone_number_client()
181181
capabilities = PhoneNumberCapabilities(
182182
calling=PhoneNumberCapabilityType.INBOUND,
183-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
183+
sms=PhoneNumberCapabilityType.NONE
184184
)
185185
async with phone_number_client:
186186
search_poller = await phone_number_client.begin_search_available_phone_numbers(
187-
self.country_code,
187+
"CA",
188188
PhoneNumberType.TOLL_FREE,
189189
PhoneNumberAssignmentType.APPLICATION,
190190
capabilities,
@@ -209,11 +209,11 @@ async def test_purchase_phone_numbers_from_managed_identity_dnr(self):
209209
phone_number_client = self._get_managed_identity_phone_number_client()
210210
capabilities = PhoneNumberCapabilities(
211211
calling=PhoneNumberCapabilityType.INBOUND,
212-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
212+
sms=PhoneNumberCapabilityType.NONE
213213
)
214214
async with phone_number_client:
215215
search_poller = await phone_number_client.begin_search_available_phone_numbers(
216-
"IT",
216+
"US",
217217
PhoneNumberType.TOLL_FREE,
218218
PhoneNumberAssignmentType.APPLICATION,
219219
capabilities,
@@ -236,11 +236,11 @@ async def test_purchase_phone_numbers_from_managed_identity_dnr(self):
236236
async def test_purchase_phone_numbers(self):
237237
capabilities = PhoneNumberCapabilities(
238238
calling=PhoneNumberCapabilityType.INBOUND,
239-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
239+
sms=PhoneNumberCapabilityType.NONE
240240
)
241241
async with self.phone_number_client:
242242
search_poller = await self.phone_number_client.begin_search_available_phone_numbers(
243-
self.country_code,
243+
"CA",
244244
PhoneNumberType.TOLL_FREE,
245245
PhoneNumberAssignmentType.APPLICATION,
246246
capabilities,
@@ -263,11 +263,11 @@ async def test_purchase_phone_numbers(self):
263263
async def test_purchase_phone_numbers_dnr(self):
264264
capabilities = PhoneNumberCapabilities(
265265
calling=PhoneNumberCapabilityType.INBOUND,
266-
sms=PhoneNumberCapabilityType.INBOUND_OUTBOUND
266+
sms=PhoneNumberCapabilityType.NONE
267267
)
268268
async with self.phone_number_client:
269269
search_poller = await self.phone_number_client.begin_search_available_phone_numbers(
270-
"IT",
270+
"US",
271271
PhoneNumberType.TOLL_FREE,
272272
PhoneNumberAssignmentType.APPLICATION,
273273
capabilities,

sdk/communication/azure-communication-phonenumbers/test/test_phone_number_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_build_phone_numbers_get_search_result_request():
2121
assert isinstance(request, HttpRequest)
2222
assert request.method == "GET"
2323
assert test_id in request.url
24-
assert "api-version=2022-12-01" in request.url
24+
assert "api-version=2023-10-01-preview" in request.url
2525
assert request.headers["Accept"] == "application/json"
2626

2727
def test_build_phone_numbers_purchase_phone_numbers_request():

0 commit comments

Comments
 (0)