Skip to content

Commit a9f27e1

Browse files
author
Hovsep Mkrtchyan
committed
Fixed Test Failures in SM.
1 parent 54ebc10 commit a9f27e1

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

src/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ protected override void InitializeQosEvent()
123123
// IsSuccess = true,
124124
//};
125125

126-
//if (this.DefaultContext != null && this.DefaultContext.Subscription != null)
126+
//if (this.Context != null && this.Context.Subscription != null)
127127
//{
128128
// QosEvent.Uid = MetricHelper.GenerateSha256HashString(
129-
// this.DefaultContext.Subscription.Id.ToString());
129+
// this.Context.Subscription.Id.ToString());
130130
//}
131131
//else
132132
//{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHDInsightCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ protected AzureSubscription GetCurrentSubscription(string Subscription, X509Cert
153153

154154
return testSubscription;
155155
#else
156-
return this.Profile.DefaultContext.Subscription;
156+
return this.Profile.Context.Subscription;
157157
#endif
158158
}
159159
}

src/ServiceManagement/Services/Commands.Test/Profile/NewAzureProfileTests.ps1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ function Test-CreatesNewAzureProfileWithCertificate
3838
$actual = New-AzureProfile -SubscriptionId "058de55e-28e0-49e7-8cf2-6701d4a88ef5" -StorageAccount myStorage -Certificate $testCert
3939

4040
# Assert
41-
Assert-AreEqual "058de55e-28e0-49e7-8cf2-6701d4a88ef5" $actual.DefaultContext.Subscription.Id
42-
Assert-AreEqual "AzureCloud" $actual.DefaultContext.Environment.Name
43-
Assert-AreEqual "Certificate" $actual.DefaultContext.Account.Type
41+
Assert-AreEqual "058de55e-28e0-49e7-8cf2-6701d4a88ef5" $actual.Context.Subscription.Id
42+
Assert-AreEqual "AzureCloud" $actual.Context.Environment.Name
43+
Assert-AreEqual "Certificate" $actual.Context.Account.Type
4444
}
4545

4646
<#
@@ -53,10 +53,10 @@ function Test-CreatesNewAzureProfileWithUserCredentials
5353
$actual = New-AzureProfile -SubscriptionId "058de55e-28e0-49e7-8cf2-6701d4a88ef5" -StorageAccount myStorage -Credentials $testCreds -Tenant "testTenant"
5454

5555
# Assert
56-
Assert-AreEqual "058de55e-28e0-49e7-8cf2-6701d4a88ef5" $actual.DefaultContext.Subscription.Id
57-
Assert-AreEqual "AzureCloud" $actual.DefaultContext.Environment.Name
58-
Assert-AreEqual "[email protected]" $actual.DefaultContext.Account.Id
59-
Assert-AreEqual "User" $actual.DefaultContext.Account.Type
56+
Assert-AreEqual "058de55e-28e0-49e7-8cf2-6701d4a88ef5" $actual.Context.Subscription.Id
57+
Assert-AreEqual "AzureCloud" $actual.Context.Environment.Name
58+
Assert-AreEqual "[email protected]" $actual.Context.Account.Id
59+
Assert-AreEqual "User" $actual.Context.Account.Type
6060
}
6161

6262
<#
@@ -69,10 +69,10 @@ function Test-CreatesNewAzureProfileWithAccessToken
6969
$actual = New-AzureProfile -SubscriptionId "058de55e-28e0-49e7-8cf2-6701d4a88ef5" -StorageAccount myStorage -AccessToken "123456" -AccountId myAccount
7070

7171
# Assert
72-
Assert-AreEqual "058de55e-28e0-49e7-8cf2-6701d4a88ef5" $actual.DefaultContext.Subscription.Id
73-
Assert-AreEqual "AzureCloud" $actual.DefaultContext.Environment.Name
74-
Assert-AreEqual "myAccount" $actual.DefaultContext.Account.Id
75-
Assert-AreEqual "AccessToken" $actual.DefaultContext.Account.Type
72+
Assert-AreEqual "058de55e-28e0-49e7-8cf2-6701d4a88ef5" $actual.Context.Subscription.Id
73+
Assert-AreEqual "AzureCloud" $actual.Context.Environment.Name
74+
Assert-AreEqual "myAccount" $actual.Context.Account.Id
75+
Assert-AreEqual "AccessToken" $actual.Context.Account.Type
7676
}
7777

7878
<#
@@ -110,7 +110,7 @@ function Test-NewAzureProfileInRDFEMode
110110
{
111111
param([string] $token, [string] $user, [string] $sub)
112112
$profile = $(Create-Profile $token $user $sub)
113-
Assert-AreEqual "AzureCloud" $Profile.DefaultContext.Environment.Name
113+
Assert-AreEqual "AzureCloud" $Profile.Context.Environment.Name
114114
Clear-AzureProfile -Force
115115
$locations = Get-AzureLocation -Profile $profile
116116
Assert-NotNull $locations
@@ -125,7 +125,7 @@ function Test-NewAzureProfileInARMMode
125125
{
126126
param([string] $token, [string] $user, [string] $sub)
127127
$profile = $(Create-Profile $token $user $sub)
128-
Assert-AreEqual "AzureCloud" $($Profile.DefaultContext.Environment.Name) "Expecting the azure cloud environment"
128+
Assert-AreEqual "AzureCloud" $($Profile.Context.Environment.Name) "Expecting the azure cloud environment"
129129
Clear-AzureProfile -Force
130130
$locations = Get-AzureLocation -Profile $profile
131131
Assert-NotNull $locations

src/ServiceManagement/Services/Commands.Test/Profile/SelectAzureProfileTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function Test-SelectDefaultProfile
2020
{
2121
param([string] $token, [string] $user, [string] $sub)
2222
$profile = $(New-AzureProfile -SubscriptionId $sub -AccessToken $token -AccountId $user)
23-
Assert-AreEqual "AzureCloud" $Profile.DefaultContext.Environment.Name
23+
Assert-AreEqual "AzureCloud" $Profile.Context.Environment.Name
2424
Select-AzureProfile $profile
2525
$profile2 = Select-AzureProfile -Default
2626
Assert-NotNull $($profile2.ProfilePath)
@@ -34,7 +34,7 @@ function Test-NewAzureProfileInRDFEMode
3434
{
3535
param([string] $token, [string] $user, [string] $sub)
3636
$profile = $(New-AzureProfile -SubscriptionId $sub -AccessToken $token -AccountId $user)
37-
Assert-AreEqual "AzureCloud" $Profile.DefaultContext.Environment.Name
37+
Assert-AreEqual "AzureCloud" $Profile.Context.Environment.Name
3838
Select-AzureProfile $profile
3939
$locations = Get-AzureLocation
4040
Assert-NotNull $locations
@@ -49,7 +49,7 @@ function Test-NewAzureProfileInARMMode
4949
{
5050
param([string] $token, [string] $user, [string] $sub)
5151
$profile = $(New-AzureProfile -SubscriptionId $sub -AccessToken $token -AccountId $user)
52-
Assert-AreEqual "AzureCloud" $($Profile.DefaultContext.Environment.Name) "Expecting the azure cloud environment"
52+
Assert-AreEqual "AzureCloud" $($Profile.Context.Environment.Name) "Expecting the azure cloud environment"
5353
Select-AzureProfile $profile
5454
$locations = Get-AzureLocation
5555
Assert-NotNull $locations

0 commit comments

Comments
 (0)