diff --git a/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs index b5413f7717d5..0dbad5c377c4 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs @@ -412,8 +412,14 @@ public async Task GetUserDelegationKey_ArgumentException() // Act await TestHelper.AssertExpectedExceptionAsync( - service.GetUserDelegationKeyAsync(startsOn: null, expiresOn: Recording.Now.AddHours(1)), - e => Assert.AreEqual("expiresOn must be UTC", e.Message)); + service.GetUserDelegationKeyAsync( + startsOn: null, + // ensure the time used is not UTC, as DateTimeOffset.Now could actually be UTC based on OS settings + // Use a custom time zone so we aren't dependent on OS having specific standard time zone. + expiresOn: TimeZoneInfo.ConvertTime( + Recording.Now.AddHours(1), + TimeZoneInfo.CreateCustomTimeZone("Storage Test Custom Time Zone", TimeSpan.FromHours(-3), "CTZ", "CTZ"))), + e => Assert.AreEqual("expiresOn must be UTC", e.Message)); ; } [Test] diff --git a/sdk/storage/Azure.Storage.sln b/sdk/storage/Azure.Storage.sln index 3447353b936b..5a21be75a3de 100644 --- a/sdk/storage/Azure.Storage.sln +++ b/sdk/storage/Azure.Storage.sln @@ -206,7 +206,6 @@ Global {AD85524A-FB82-475C-9907-27DBC2BE2945} = {9EF57C69-DC48-4E5C-BBD5-76E23E4ADDA6} {6EEF892F-E4EE-4610-9C94-4B206D9E7152} = {F4218B06-A246-4762-984D-5BC852B62889} {9B235463-7D89-471E-87CA-A392661255E4} = {B93D17A7-F7D7-4A2E-9E57-7B6ED57EF749} - {9260EB26-0D9A-4D71-B588-7106999C745B} = {F4218B06-A246-4762-984D-5BC852B62889} {610DBA57-60FD-4115-8D74-F13A8428973E} = {B93D17A7-F7D7-4A2E-9E57-7B6ED57EF749} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution