Skip to content

Commit d9398e3

Browse files
xiafu-msftzezha-msft
authored andcommitted
[Fix]Fix the Breaking Recordings
Add a private filed in storageclient, so that only validate client request id when the test is running in Playback mode.
1 parent 48f859d commit d9398e3

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

azure-storage-common/azure/storage/common/storageclient.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ def __init__(self, connection_params):
150150
self.retry_callback = None
151151
self._X_MS_VERSION = DEFAULT_X_MS_VERSION
152152
self._USER_AGENT_STRING = DEFAULT_USER_AGENT_STRING
153+
self._is_validating_request_id = True
153154

154155
def _update_user_agent_string(self, service_package_version):
155156
self._USER_AGENT_STRING = '{}{} {}'.format(USER_AGENT_STRING_PREFIX,
@@ -336,7 +337,8 @@ def _perform_request(self, request, parser=None, parser_args=None, operation_con
336337
self.response_callback(response)
337338

338339
# Validate the client request ID
339-
self._validate_echoed_client_request_id(request, response)
340+
if self._is_validating_request_id:
341+
self._validate_echoed_client_request_id(request, response)
340342

341343
# Set the response context
342344
retry_context.response = response

tests/testcase.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ def _create_storage_service(self, service_class, settings):
168168
settings.STORAGE_ACCOUNT_KEY,
169169
protocol=settings.PROTOCOL,
170170
)
171+
service._is_validating_request_id = False if TestMode.is_playback(self.test_mode) else True
171172
self._set_test_proxy(service, settings)
172173
return service
173174

@@ -186,6 +187,7 @@ def _create_storage_service_for_blob_storage_account(self, service_class, settin
186187
else:
187188
raise SkipTest('BLOB_CONNECTION_STRING or BLOB_STORAGE_ACCOUNT_NAME must be populated to run this test')
188189

190+
service._is_validating_request_id = False if TestMode.is_playback(self.test_mode) else True
189191
self._set_test_proxy(service, settings)
190192
return service
191193

@@ -203,6 +205,7 @@ def _create_premium_storage_service(self, service_class, settings):
203205
else:
204206
raise SkipTest('PREMIUM_CONNECTION_STRING or PREMIUM_STORAGE_ACCOUNT_NAME must be populated to run this test')
205207

208+
service._is_validating_request_id = False if TestMode.is_playback(self.test_mode) else True
206209
self._set_test_proxy(service, settings)
207210
return service
208211

@@ -215,6 +218,8 @@ def _create_remote_storage_service(self, service_class, settings):
215218
)
216219
else:
217220
print("REMOTE_STORAGE_ACCOUNT_NAME and REMOTE_STORAGE_ACCOUNT_KEY not set in test settings file.")
221+
222+
service._is_validating_request_id = False if TestMode.is_playback(self.test_mode) else True
218223
self._set_test_proxy(service, settings)
219224
return service
220225

0 commit comments

Comments
 (0)