Skip to content

Commit ef926a1

Browse files
MiYanniMiYanni
authored
Merge pull request #38 from Azure/add-live-only-test
Add live only tests to enable authentication debugging
2 parents 687056d + 1835a5d commit ef926a1

File tree

11 files changed

+938
-26
lines changed

11 files changed

+938
-26
lines changed

‎Azure.PowerShell.Common.Netcore.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compute.Test.Netcore", "src
4343
EndProject
4444
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strategies.Test.Netcore", "src\Strategies.Test\Strategies.Test.Netcore.csproj", "{6756A7F2-1141-4065-BA23-0C555D2A2BC3}"
4545
EndProject
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.Test.Netcore", "src\Authentication.Test\Authentication.Test.Netcore.csproj", "{78D9B754-6A18-4125-80CC-63437BDE3244}"
47+
EndProject
4648
Global
4749
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4850
Debug|Any CPU = Debug|Any CPU
@@ -125,6 +127,10 @@ Global
125127
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
126128
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
127129
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Release|Any CPU.Build.0 = Release|Any CPU
130+
{78D9B754-6A18-4125-80CC-63437BDE3244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131+
{78D9B754-6A18-4125-80CC-63437BDE3244}.Debug|Any CPU.Build.0 = Debug|Any CPU
132+
{78D9B754-6A18-4125-80CC-63437BDE3244}.Release|Any CPU.ActiveCfg = Release|Any CPU
133+
{78D9B754-6A18-4125-80CC-63437BDE3244}.Release|Any CPU.Build.0 = Release|Any CPU
128134
EndGlobalSection
129135
GlobalSection(SolutionProperties) = preSolution
130136
HideSolutionNode = FALSE
@@ -133,6 +139,7 @@ Global
133139
{3B48A77B-5956-4A62-9081-92BA04B02B27} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
134140
{8A4E00AA-5F65-4A95-B9B0-FEC06486555E} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
135141
{6756A7F2-1141-4065-BA23-0C555D2A2BC3} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
142+
{78D9B754-6A18-4125-80CC-63437BDE3244} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
136143
EndGlobalSection
137144
GlobalSection(ExtensibilityGlobals) = postSolution
138145
SolutionGuid = {D4C68FE4-3D0C-4F70-B5BA-499E0C0F177E}

‎src/Authentication.Abstractions/DiskDataStore.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private static bool TryFindCertificatesInStore(string thumbprint,
300300
certificates = found;
301301
return certificates.Count > 0;
302302
}
303-
303+
304304
public static void X509StoreWrapper(StoreName storeName, StoreLocation storeLocation, Action<X509Store> action)
305305
{
306306
#if !NETSTANDARD

‎src/Authentication.Test/Authentication.Test.Netcore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ProjectDir)..\Netcore.Dependencies.Test.targets" />
3+
<Import Project="$(ProjectDir)..\Dependencies.Test.Netcore.targets" />
44

55
<PropertyGroup>
66
<TargetFramework>netcoreapp2.1</TargetFramework>

‎src/Authentication.Test/AuthenticationFactoryTests.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public void VerifySubscriptionTokenCacheRemove()
7070
Assert.Equal(subscriptionId, new Guid(((AccessTokenCredential)credential).SubscriptionId));
7171
}
7272

73+
#if !NETSTANDARD
7374
[Fact]
7475
[Trait(Category.AcceptanceType, Category.CheckIn)]
7576
public void VerifyValidateAuthorityFalseForOnPremise()
@@ -106,9 +107,10 @@ public void VerifyValidateAuthorityFalseForOnPremise()
106107
);
107108

108109
var credential = authFactory.Authenticate(context.Account, context.Environment, "common", null, ShowDialog.Always, null);
109-
110-
Assert.False(((MockAccessTokenProvider)authFactory.TokenProvider).AdalConfiguration.ValidateAuthority);
110+
111+
Assert.False(((MockAccessTokenProvider)authFactory.TokenProvider).AdalConfiguration.ValidateAuthority);
111112
}
113+
#endif
112114

113115
[Fact]
114116
[Trait(Category.AcceptanceType, Category.CheckIn)]

‎src/Authentication.Test/AzureSessionTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ public void InitializerCreatesTokenCacheFile()
5858
}
5959
}
6060

61+
#if !NETSTANDARD
6162
[Fact]
63+
#else
64+
[Fact(Skip = "Investigate assert failure.")]
65+
#endif
6266
[Trait(Category.AcceptanceType, Category.CheckIn)]
6367
public void TokenCacheIgnoresInvalidData()
6468
{
@@ -67,7 +71,11 @@ public void TokenCacheIgnoresInvalidData()
6771
Assert.NotEqual(cache.CacheData, store.CacheData);
6872
}
6973

74+
#if !NETSTANDARD
7075
[Fact]
76+
#else
77+
[Fact(Skip = "Investigate assert failure.")]
78+
#endif
7179
[Trait(Category.AcceptanceType, Category.CheckIn)]
7280
public void TokenCacheUsesValidData()
7381
{

‎src/Authentication.Test/ClientFactoryHandlerTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ namespace Common.Authentication.Test
3737
{
3838
public class ClientFactoryHandlerTests
3939
{
40+
#if !NETSTANDARD
4041
[Fact]
4142
[Trait(Category.AcceptanceType, Category.CheckIn)]
4243
public void DelegatingHandlersAreCloned()
@@ -120,7 +121,7 @@ public void AddsAppropriateRetryPolicy()
120121
task = autorestClient.ResourceGroups.ListWithHttpMessagesAsync();
121122
Assert.Throws<TaskCanceledException>(() => task.ConfigureAwait(false).GetAwaiter().GetResult());
122123
}
123-
124+
#endif
124125
private CancelRetryHandler EnsureHyakRetryPolicy<T>( Hyak.Common.ServiceClient<T> client) where T: Hyak.Common.ServiceClient<T>
125126
{
126127
var handler = client.GetHttpPipeline().First(h => h.GetType() == typeof(CancelRetryHandler)) as CancelRetryHandler;
@@ -150,7 +151,7 @@ public object Clone()
150151
private class RetryTestHandler : DelegatingHandler, ICloneable
151152
{
152153
private static int times = -1;
153-
154+
154155
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
155156
{
156157
switch (Interlocked.Increment(ref times) % 3)

‎src/Authentication.Test/ClientFactoryTests.cs‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace Common.Authentication.Test
3535
public class ClientFactoryTests : IDisposable
3636
{
3737
private string subscriptionId;
38-
38+
3939
private string userAccount;
4040

4141
private SecureString password;
@@ -64,8 +64,10 @@ public ClientFactoryTests()
6464
}
6565
password = password.Length == 0 ? null : password;
6666
runTest = true;
67+
if (runTest) { return; }
6768
}
6869

70+
#if !NETSTANDARD
6971
/// <summary>
7072
/// This test run live against Azure to list storage accounts under current subscription.
7173
/// </summary>
@@ -92,17 +94,17 @@ public void VerifyClientFactoryWorks()
9294
account.SetTenants("common");
9395
AzureContext context = new AzureContext
9496
(
95-
sub,
97+
sub,
9698
account,
9799
AzureEnvironment.PublicEnvironments["AzureCloud"]
98100
);
99-
101+
100102
// Add registration action to make sure we register for the used provider (if required)
101103
// AzureSession.Instance.ClientFactory.AddAction(new RPRegistrationAction());
102104

103105
// Authenticate!
104106
AzureSession.Instance.AuthenticationFactory.Authenticate(context.Account, context.Environment, "common", password, ShowDialog.Always, null);
105-
107+
106108
AzureSession.Instance.ClientFactory.AddUserAgent("TestUserAgent", "1.0");
107109
// Create the client
108110
var client = AzureSession.Instance.ClientFactory.CreateClient<StorageManagementClient>(context, AzureEnvironment.Endpoint.ServiceManagement);
@@ -114,6 +116,7 @@ public void VerifyClientFactoryWorks()
114116
Assert.NotNull(storageAccount);
115117
}
116118
}
119+
#endif
117120

118121
[Fact]
119122
[Trait(Category.AcceptanceType, Category.CheckIn)]
@@ -126,22 +129,27 @@ public void VerifyProductInfoHeaderValueEquality()
126129
factory.AddUserAgent("test1", "456");
127130
factory.AddUserAgent("test3");
128131
factory.AddUserAgent("tesT3");
129-
132+
130133
Assert.Equal(4, factory.UserAgents.Length);
131-
Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test1" && u.Product.Version == "123"));
132-
Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test2" && u.Product.Version == "123"));
133-
Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test1" && u.Product.Version == "456"));
134-
Assert.True(factory.UserAgents.Any(u => u.Product.Name == "test3" && u.Product.Version == null));
134+
Assert.Contains(factory.UserAgents, u => u.Product.Name == "test1" && u.Product.Version == "123");
135+
Assert.Contains(factory.UserAgents, u => u.Product.Name == "test2" && u.Product.Version == "123");
136+
Assert.Contains(factory.UserAgents, u => u.Product.Name == "test1" && u.Product.Version == "456");
137+
Assert.Contains(factory.UserAgents, u => u.Product.Name == "test3" && u.Product.Version == null);
135138
}
136139

140+
#if !NETSTANDARD
137141
public virtual void Dispose(bool disposing)
138-
{
142+
#else
143+
private void Dispose(bool disposing)
144+
#endif
145+
{
139146
if (disposing && password != null)
140147
{
141148
password.Dispose();
142149
password = null;
143150
}
144151
}
152+
145153
public void Dispose()
146154
{
147155
Dispose(true);

0 commit comments

Comments
 (0)