Skip to content

Commit 715880a

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#6817 from jeffrey-ACE/preview
fix ManagementPartner tests
2 parents 656806f + 17812a6 commit 715880a

File tree

9 files changed

+207
-213
lines changed

9 files changed

+207
-213
lines changed

‎TestMappings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@
198198
"src/ResourceManager/Websites/": [
199199
".\\src\\ResourceManager\\LogicApp\\Commands.LogicApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.LogicApp.Test.dll",
200200
".\\src\\ResourceManager\\Websites\\Commands.Websites.Test\\bin\\Debug\\Microsoft.Azure.Commands.Websites.Test.dll"
201+
],
202+
"src/ResourceManager/ManagementPartner/": [
203+
".\\src\\ResourceManager\\ManagementPartner\\Commands.Partner.Test\\bin\\Debug\\Microsoft.Azure.Commands.ManagementPartner.Test.dll"
201204
],
202205
"src/ServiceManagement/": [
203206
".\\src\\ServiceManagement\\Common\\Commands.Common.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Common.Test.dll",

‎src/ResourceManager/ManagementPartner/Commands.Partner.Test/Commands.Partner.Test.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.ManagementPartner, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ManagementPartner.1.0.0-preview\lib\net452\Microsoft.Azure.Management.ManagementPartner.dll</HintPath>
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ManagementPartner.1.1.0-preview\lib\net452\Microsoft.Azure.Management.ManagementPartner.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -63,7 +63,7 @@
6363
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.8.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -74,9 +74,10 @@
7474
</Reference>
7575
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7676
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.0\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
77+
<Private>True</Private>
7778
</Reference>
78-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
79-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
79+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
8081
<Private>True</Private>
8182
</Reference>
8283
<Reference Include="Microsoft.Threading.Tasks">
@@ -176,4 +177,4 @@
176177
<PostBuildEvent>rem xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E
177178
</PostBuildEvent>
178179
</PropertyGroup>
179-
</Project>
180+
</Project>

‎src/ResourceManager/ManagementPartner/Commands.Partner.Test/ScenarioTests/ManagementPartnerTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Tests get management partner
2121
function Test-GetPartner
2222
{
2323
# Setup
24-
$partnerId="123457"
24+
$partnerId="5127255"
2525
$partner = New-AzureRmManagementPartner -PartnerId $partnerId
2626

2727
# Test
@@ -45,7 +45,7 @@ Tests get management partner without parnter id
4545
function Test-GetPartnerNoPartnerId
4646
{
4747
# Setup
48-
$partnerId="123457"
48+
$partnerId="5127255"
4949
$partner = New-AzureRmManagementPartner -PartnerId $partnerId
5050

5151
# Test
@@ -68,7 +68,7 @@ Tests add management partner
6868
#>
6969
function Test-NewPartner
7070
{
71-
$partnerId="123457"
71+
$partnerId="5127255"
7272
$partner = New-AzureRmManagementPartner -PartnerId $partnerId
7373

7474
# Assert
@@ -89,11 +89,11 @@ Tests update management partner
8989
function Test-UpdatePartner
9090
{
9191
# Setup
92-
$partnerId="123457"
92+
$partnerId="5127255"
9393
$partner = New-AzureRmManagementPartner -PartnerId $partnerId
9494

9595
# Test
96-
$newPartnerId="123456"
96+
$newPartnerId="5127254"
9797
$partner = Update-AzureRmManagementPartner -PartnerId $newPartnerId
9898

9999
# Assert
@@ -113,7 +113,7 @@ Tests remove management partner
113113
function Test-RemovePartner
114114
{
115115
# Setup
116-
$partnerId="123457"
116+
$partnerId="5127255"
117117
$partner = New-AzureRmManagementPartner -PartnerId $partnerId
118118

119119
# Test

‎src/ResourceManager/ManagementPartner/Commands.Partner.Test/SessionRecords/Microsoft.Azure.Commands.ManagementPartner.Test.ScenarioTests.ManagementPartnerTests/TestGetPartner.json

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/123457?api-version=2018-02-01",
5-
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvMTIzNDU3P2FwaS12ZXJzaW9uPTIwMTgtMDItMDE=",
4+
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/5127255?api-version=2018-02-01",
5+
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvNTEyNzI1NT9hcGktdmVyc2lvbj0yMDE4LTAyLTAx",
66
"RequestMethod": "PUT",
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"e597c0e8-4cb5-41e8-a27d-645a0575800f"
10+
"58b587dc-3a52-4be4-ae03-e0c978c077ee"
1111
],
1212
"accept-language": [
1313
"en-US"
1414
],
1515
"User-Agent": [
16-
"FxVersion/4.7.2600.0",
16+
"FxVersion/4.7.3131.0",
1717
"OSName/Windows10Enterprise",
18-
"OSVersion/6.3.16299",
18+
"OSVersion/6.3.17134",
1919
"Microsoft.Azure.Management.ManagementPartner.ACEProvisioningManagementPartnerAPIClient/0.0.0.0"
2020
]
2121
},
22-
"ResponseBody": "{\r\n \"id\": \"/providers/microsoft.managementpartner/partners/123457\",\r\n \"type\": \"Microsoft.ManagementPartner/partners\",\r\n \"name\": \"123457\",\r\n \"etag\": 53,\r\n \"properties\": {\r\n \"partnerId\": \"123457\",\r\n \"tenantId\": \"1b1121dd-6900-412a-af73-e8d44f81e1c1\",\r\n \"objectId\": \"2119ba66-2042-49a1-bc31-940691d21bf4\",\r\n \"version\": 53,\r\n \"updatedTime\": \"2018-02-07T23:49:06.0075959Z\",\r\n \"createdTime\": \"2018-01-20T05:36:32.6851653Z\",\r\n \"state\": \"Active\"\r\n }\r\n}",
22+
"ResponseBody": "{\r\n \"id\": \"/providers/microsoft.managementpartner/partners/5127255\",\r\n \"type\": \"Microsoft.ManagementPartner/partners\",\r\n \"name\": \"5127255\",\r\n \"etag\": 12,\r\n \"properties\": {\r\n \"partnerId\": \"5127255\",\r\n \"partnerName\": \"Test_Test_DhirajTesting\",\r\n \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\",\r\n \"objectId\": \"ac9a0626-3ff0-46e2-9974-bbfba246f6dc\",\r\n \"version\": 12,\r\n \"updatedTime\": \"2018-07-30T21:04:54.2361056Z\",\r\n \"createdTime\": \"2018-02-21T20:07:21.1341292Z\",\r\n \"state\": \"Active\"\r\n }\r\n}",
2323
"ResponseHeaders": {
2424
"Content-Length": [
25-
"391"
25+
"434"
2626
],
2727
"Content-Type": [
2828
"application/json; charset=utf-8"
@@ -37,34 +37,34 @@
3737
"Accept-Encoding"
3838
],
3939
"x-ms-ratelimit-remaining-tenant-writes": [
40-
"1194"
40+
"1199"
4141
],
4242
"request-id": [
43-
"3ab09812-d5ce-45d9-9f0c-eb1213566cf7"
43+
"7d3498ff-ef8c-44e8-957f-89694c5dac70"
4444
],
4545
"x-gsm": [
46-
"8.1.0.50 (AD-CAB-Provisioning:stage.ef4dadac6.180207-2231)"
46+
"8.6.0.6 (AD-CAB-Provisioning:master.4ee42e748.180717-2225)"
4747
],
48-
"x-content-type-options": [
48+
"X-Content-Type-Options": [
4949
"nosniff"
5050
],
5151
"Strict-Transport-Security": [
5252
"max-age=31536000; includeSubDomains"
5353
],
5454
"x-ms-request-id": [
55-
"9a9ebc4a-d7cb-453b-ab89-c3563e1ab6ae"
55+
"f9a784f7-1ca8-4d9d-8956-70701ac959f8"
5656
],
5757
"x-ms-correlation-request-id": [
58-
"9a9ebc4a-d7cb-453b-ab89-c3563e1ab6ae"
58+
"f9a784f7-1ca8-4d9d-8956-70701ac959f8"
5959
],
6060
"x-ms-routing-request-id": [
61-
"CENTRALUS:20180207T234906Z:9a9ebc4a-d7cb-453b-ab89-c3563e1ab6ae"
61+
"WESTUS2:20180730T210454Z:f9a784f7-1ca8-4d9d-8956-70701ac959f8"
6262
],
6363
"Cache-Control": [
6464
"no-cache"
6565
],
6666
"Date": [
67-
"Wed, 07 Feb 2018 23:49:06 GMT"
67+
"Mon, 30 Jul 2018 21:04:53 GMT"
6868
],
6969
"Server": [
7070
"Microsoft-IIS/8.5"
@@ -73,28 +73,28 @@
7373
"StatusCode": 200
7474
},
7575
{
76-
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/123457?api-version=2018-02-01",
77-
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvMTIzNDU3P2FwaS12ZXJzaW9uPTIwMTgtMDItMDE=",
76+
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/5127255?api-version=2018-02-01",
77+
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvNTEyNzI1NT9hcGktdmVyc2lvbj0yMDE4LTAyLTAx",
7878
"RequestMethod": "GET",
7979
"RequestBody": "",
8080
"RequestHeaders": {
8181
"x-ms-client-request-id": [
82-
"357f38e5-e9f8-457e-8a4d-484385381352"
82+
"f2788f72-e30c-4558-8773-94757d2bfd6e"
8383
],
8484
"accept-language": [
8585
"en-US"
8686
],
8787
"User-Agent": [
88-
"FxVersion/4.7.2600.0",
88+
"FxVersion/4.7.3131.0",
8989
"OSName/Windows10Enterprise",
90-
"OSVersion/6.3.16299",
90+
"OSVersion/6.3.17134",
9191
"Microsoft.Azure.Management.ManagementPartner.ACEProvisioningManagementPartnerAPIClient/0.0.0.0"
9292
]
9393
},
94-
"ResponseBody": "{\r\n \"id\": \"/providers/microsoft.managementpartner/partners/123457\",\r\n \"type\": \"Microsoft.ManagementPartner/partners\",\r\n \"name\": \"123457\",\r\n \"etag\": 53,\r\n \"properties\": {\r\n \"partnerId\": \"123457\",\r\n \"tenantId\": \"1b1121dd-6900-412a-af73-e8d44f81e1c1\",\r\n \"objectId\": \"2119ba66-2042-49a1-bc31-940691d21bf4\",\r\n \"version\": 53,\r\n \"updatedTime\": \"2018-02-07T23:49:06.0075959Z\",\r\n \"createdTime\": \"2018-01-20T05:36:32.6851653Z\",\r\n \"state\": \"Active\"\r\n }\r\n}",
94+
"ResponseBody": "{\r\n \"id\": \"/providers/microsoft.managementpartner/partners/5127255\",\r\n \"type\": \"Microsoft.ManagementPartner/partners\",\r\n \"name\": \"5127255\",\r\n \"etag\": 12,\r\n \"properties\": {\r\n \"partnerId\": \"5127255\",\r\n \"partnerName\": \"Test_Test_DhirajTesting\",\r\n \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\",\r\n \"objectId\": \"ac9a0626-3ff0-46e2-9974-bbfba246f6dc\",\r\n \"version\": 12,\r\n \"updatedTime\": \"2018-07-30T21:04:54.2361056Z\",\r\n \"createdTime\": \"2018-02-21T20:07:21.1341292Z\",\r\n \"state\": \"Active\"\r\n }\r\n}",
9595
"ResponseHeaders": {
9696
"Content-Length": [
97-
"391"
97+
"434"
9898
],
9999
"Content-Type": [
100100
"application/json; charset=utf-8"
@@ -109,34 +109,34 @@
109109
"Accept-Encoding"
110110
],
111111
"x-ms-ratelimit-remaining-tenant-reads": [
112-
"14954"
112+
"14999"
113113
],
114114
"request-id": [
115-
"aad599d0-3008-4ec5-8cd7-74e92edcdf16"
115+
"45a970c3-bc0e-4606-9347-e0a607fbaee2"
116116
],
117117
"x-gsm": [
118-
"8.1.0.50 (AD-CAB-Provisioning:stage.ef4dadac6.180207-2231)"
118+
"8.6.0.6 (AD-CAB-Provisioning:master.4ee42e748.180717-2225)"
119119
],
120-
"x-content-type-options": [
120+
"X-Content-Type-Options": [
121121
"nosniff"
122122
],
123123
"Strict-Transport-Security": [
124124
"max-age=31536000; includeSubDomains"
125125
],
126126
"x-ms-request-id": [
127-
"57782269-bbac-4e08-bfca-d90d1e83ed62"
127+
"33b6a2fc-6830-47c9-9a4e-6ccf681c6845"
128128
],
129129
"x-ms-correlation-request-id": [
130-
"57782269-bbac-4e08-bfca-d90d1e83ed62"
130+
"33b6a2fc-6830-47c9-9a4e-6ccf681c6845"
131131
],
132132
"x-ms-routing-request-id": [
133-
"CENTRALUS:20180207T234906Z:57782269-bbac-4e08-bfca-d90d1e83ed62"
133+
"WESTUS2:20180730T210455Z:33b6a2fc-6830-47c9-9a4e-6ccf681c6845"
134134
],
135135
"Cache-Control": [
136136
"no-cache"
137137
],
138138
"Date": [
139-
"Wed, 07 Feb 2018 23:49:06 GMT"
139+
"Mon, 30 Jul 2018 21:04:54 GMT"
140140
],
141141
"Server": [
142142
"Microsoft-IIS/8.5"
@@ -145,21 +145,21 @@
145145
"StatusCode": 200
146146
},
147147
{
148-
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/123457?api-version=2018-02-01",
149-
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvMTIzNDU3P2FwaS12ZXJzaW9uPTIwMTgtMDItMDE=",
148+
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/5127255?api-version=2018-02-01",
149+
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvNTEyNzI1NT9hcGktdmVyc2lvbj0yMDE4LTAyLTAx",
150150
"RequestMethod": "DELETE",
151151
"RequestBody": "",
152152
"RequestHeaders": {
153153
"x-ms-client-request-id": [
154-
"a0b4bc09-e932-4b9f-9568-a18fe7d81a8a"
154+
"a477411d-6202-4b09-b5b7-4b12e0cbfc29"
155155
],
156156
"accept-language": [
157157
"en-US"
158158
],
159159
"User-Agent": [
160-
"FxVersion/4.7.2600.0",
160+
"FxVersion/4.7.3131.0",
161161
"OSName/Windows10Enterprise",
162-
"OSVersion/6.3.16299",
162+
"OSVersion/6.3.17134",
163163
"Microsoft.Azure.Management.ManagementPartner.ACEProvisioningManagementPartnerAPIClient/0.0.0.0"
164164
]
165165
},
@@ -175,34 +175,34 @@
175175
"no-cache"
176176
],
177177
"request-id": [
178-
"ca4c6f14-a6a8-41b8-9c1a-726cbc1f828a"
178+
"5537da65-bb24-4e0a-abf4-cf7f883a797d"
179179
],
180180
"x-gsm": [
181-
"8.1.0.50 (AD-CAB-Provisioning:stage.ef4dadac6.180207-2231)"
181+
"8.6.0.6 (AD-CAB-Provisioning:master.4ee42e748.180717-2225)"
182182
],
183-
"x-content-type-options": [
183+
"X-Content-Type-Options": [
184184
"nosniff"
185185
],
186186
"Strict-Transport-Security": [
187187
"max-age=31536000; includeSubDomains"
188188
],
189189
"x-ms-ratelimit-remaining-tenant-writes": [
190-
"1193"
190+
"1198"
191191
],
192192
"x-ms-request-id": [
193-
"a6bc8f2f-19a6-48b1-bc7d-1d0e694c3dee"
193+
"d34bdcab-96e3-4eaa-871d-95b8112d96d8"
194194
],
195195
"x-ms-correlation-request-id": [
196-
"a6bc8f2f-19a6-48b1-bc7d-1d0e694c3dee"
196+
"d34bdcab-96e3-4eaa-871d-95b8112d96d8"
197197
],
198198
"x-ms-routing-request-id": [
199-
"CENTRALUS:20180207T234906Z:a6bc8f2f-19a6-48b1-bc7d-1d0e694c3dee"
199+
"WESTUS2:20180730T210455Z:d34bdcab-96e3-4eaa-871d-95b8112d96d8"
200200
],
201201
"Cache-Control": [
202202
"no-cache"
203203
],
204204
"Date": [
205-
"Wed, 07 Feb 2018 23:49:06 GMT"
205+
"Mon, 30 Jul 2018 21:04:55 GMT"
206206
],
207207
"Server": [
208208
"Microsoft-IIS/8.5"
@@ -213,8 +213,6 @@
213213
],
214214
"Names": {},
215215
"Variables": {
216-
"SubscriptionId": "d14e8666-b43e-4f12-aa78-06c49c4859de",
217-
"TenantId": "1b1121dd-6900-412a-af73-e8d44f81e1c1",
218-
"Domain": ""
216+
"SubscriptionId": "5f706f09-5aaf-41ca-9e05-1f1950e6df41"
219217
}
220218
}

0 commit comments

Comments
 (0)