diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_parser.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_parser.py index 6b3142cadd82..a610527dd41b 100644 --- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_parser.py +++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_parser.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone from typing import Any, cast, Dict, Optional, Union from ._generated._utils.serialization import Serializer @@ -38,6 +38,8 @@ def _parse_datetime_from_str(string_datetime): dt = datetime.strptime(dt, "%Y-%m-%dT%H:%M:%S") us = int(us[:-2]) # microseconds datetime_obj = dt + timedelta(microseconds=us) + if not datetime_obj.tzinfo: + datetime_obj = datetime_obj.replace(tzinfo=timezone.utc) return datetime_obj diff --git a/sdk/storage/azure-storage-file-share/tests/test_directory.py b/sdk/storage/azure-storage-file-share/tests/test_directory.py index 1b879d78bc1a..dd0f5e4afcec 100644 --- a/sdk/storage/azure-storage-file-share/tests/test_directory.py +++ b/sdk/storage/azure-storage-file-share/tests/test_directory.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- import unittest -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone import pytest from azure.core.exceptions import ClientAuthenticationError, ResourceExistsError, ResourceNotFoundError @@ -110,7 +110,7 @@ def test_create_directory_set_smb_properties(self, **kwargs): directory_client = share_client.get_directory_client('dir1') file_attributes = NTFSAttributes(read_only=True, directory=True) - file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000) + file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act directory_client.create_directory( @@ -1262,9 +1262,9 @@ def test_rename_directory_smb_properties(self, **kwargs): source_directory = share_client.create_directory('dir1') file_attributes = NTFSAttributes(read_only=True, directory=True) - file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000) - file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000) - file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000) + file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc) + file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc) + file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act new_directory = source_directory.rename_directory( diff --git a/sdk/storage/azure-storage-file-share/tests/test_directory_async.py b/sdk/storage/azure-storage-file-share/tests/test_directory_async.py index 9e87810938e0..d1010ced0b09 100644 --- a/sdk/storage/azure-storage-file-share/tests/test_directory_async.py +++ b/sdk/storage/azure-storage-file-share/tests/test_directory_async.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- import unittest import asyncio -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone import pytest from azure.core.exceptions import ClientAuthenticationError, ResourceExistsError, ResourceNotFoundError @@ -115,7 +115,7 @@ async def test_create_directory_set_smb_properties(self, **kwargs): directory_client = share_client.get_directory_client('dir1') file_attributes = NTFSAttributes(read_only=True, directory=True) - file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000) + file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act await directory_client.create_directory( @@ -1362,9 +1362,9 @@ async def test_rename_directory_smb_properties(self, **kwargs): source_directory = await share_client.create_directory('dir1') file_attributes = NTFSAttributes(read_only=True, directory=True) - file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000) - file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000) - file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000) + file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc) + file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc) + file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act new_directory = await source_directory.rename_directory( diff --git a/sdk/storage/azure-storage-file-share/tests/test_file.py b/sdk/storage/azure-storage-file-share/tests/test_file.py index 819b6293c14d..627bcd85ed57 100644 --- a/sdk/storage/azure-storage-file-share/tests/test_file.py +++ b/sdk/storage/azure-storage-file-share/tests/test_file.py @@ -642,7 +642,7 @@ def test_create_file_set_smb_properties(self, **kwargs): file_client = self._get_file_client() file_attributes = NTFSAttributes(read_only=True, archive=True) - file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000) + file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act file_client.create_file( @@ -3598,9 +3598,9 @@ def test_rename_file_smb_properties(self, **kwargs): source_file = self._create_file('file1') file_attributes = NTFSAttributes(read_only=True, archive=True) - file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000) - file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000) - file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000) + file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc) + file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc) + file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act new_file = source_file.rename_file( diff --git a/sdk/storage/azure-storage-file-share/tests/test_file_async.py b/sdk/storage/azure-storage-file-share/tests/test_file_async.py index f3cc42f5da46..0320c76b3b1c 100644 --- a/sdk/storage/azure-storage-file-share/tests/test_file_async.py +++ b/sdk/storage/azure-storage-file-share/tests/test_file_async.py @@ -657,7 +657,7 @@ async def test_create_file_set_smb_properties(self, **kwargs): file_client = await self._get_file_client(storage_account_name, storage_account_key) file_attributes = NTFSAttributes(read_only=True, archive=True) - file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000) + file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act await file_client.create_file( @@ -3711,9 +3711,9 @@ async def test_rename_file_smb_properties(self, **kwargs): source_file = await self._create_file(storage_account_name, storage_account_key, 'file1') file_attributes = NTFSAttributes(read_only=True, archive=True) - file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000) - file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000) - file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000) + file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc) + file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc) + file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc) # Act new_file = await source_file.rename_file(