Skip to content

fix ManagementPartner tests #6817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 31, 2018
Merged

fix ManagementPartner tests #6817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
717884a
fix ManagementPartner tests
jeffrey-ace Jul 30, 2018
16b23ed
Update packages.config
Jul 31, 2018
17812a6
Update Commands.Partner.Test.csproj
Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions TestMappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@
"src/ResourceManager/Websites/": [
".\\src\\ResourceManager\\LogicApp\\Commands.LogicApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.LogicApp.Test.dll",
".\\src\\ResourceManager\\Websites\\Commands.Websites.Test\\bin\\Debug\\Microsoft.Azure.Commands.Websites.Test.dll"
],
"src/ResourceManager/ManagementPartner/": [
".\\src\\ResourceManager\\ManagementPartner\\Commands.Partner.Test\\bin\\Debug\\Microsoft.Azure.Commands.ManagementPartner.Test.dll"
],
"src/ServiceManagement/": [
".\\src\\ServiceManagement\\Common\\Commands.Common.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Common.Test.dll",
Expand Down
11 changes: 6 additions & 5 deletions src/ResourceManager/ManagementPartner/Commands.Partner.Test/Commands.Partner.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.ManagementPartner, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ManagementPartner.1.0.0-preview\lib\net452\Microsoft.Azure.Management.ManagementPartner.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ManagementPartner.1.1.0-preview\lib\net452\Microsoft.Azure.Management.ManagementPartner.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand All @@ -63,7 +63,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.8.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand All @@ -74,9 +74,10 @@
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.0\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks">
Expand Down Expand Up @@ -176,4 +177,4 @@
<PostBuildEvent>rem xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>
12 changes: 6 additions & 6 deletions ...eManager/ManagementPartner/Commands.Partner.Test/ScenarioTests/ManagementPartnerTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Tests get management partner
function Test-GetPartner
{
# Setup
$partnerId="123457"
$partnerId="5127255"
$partner = New-AzureRmManagementPartner -PartnerId $partnerId

# Test
Expand All @@ -45,7 +45,7 @@ Tests get management partner without parnter id
function Test-GetPartnerNoPartnerId
{
# Setup
$partnerId="123457"
$partnerId="5127255"
$partner = New-AzureRmManagementPartner -PartnerId $partnerId

# Test
Expand All @@ -68,7 +68,7 @@ Tests add management partner
#>
function Test-NewPartner
{
$partnerId="123457"
$partnerId="5127255"
$partner = New-AzureRmManagementPartner -PartnerId $partnerId

# Assert
Expand All @@ -89,11 +89,11 @@ Tests update management partner
function Test-UpdatePartner
{
# Setup
$partnerId="123457"
$partnerId="5127255"
$partner = New-AzureRmManagementPartner -PartnerId $partnerId

# Test
$newPartnerId="123456"
$newPartnerId="5127254"
$partner = Update-AzureRmManagementPartner -PartnerId $newPartnerId

# Assert
Expand All @@ -113,7 +113,7 @@ Tests remove management partner
function Test-RemovePartner
{
# Setup
$partnerId="123457"
$partnerId="5127255"
$partner = New-AzureRmManagementPartner -PartnerId $partnerId

# Test
Expand Down
90 changes: 44 additions & 46 deletions ....Commands.ManagementPartner.Test.ScenarioTests.ManagementPartnerTests/TestGetPartner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"Entries": [
{
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/123457?api-version=2018-02-01",
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvMTIzNDU3P2FwaS12ZXJzaW9uPTIwMTgtMDItMDE=",
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/5127255?api-version=2018-02-01",
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvNTEyNzI1NT9hcGktdmVyc2lvbj0yMDE4LTAyLTAx",
"RequestMethod": "PUT",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"e597c0e8-4cb5-41e8-a27d-645a0575800f"
"58b587dc-3a52-4be4-ae03-e0c978c077ee"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.7.2600.0",
"FxVersion/4.7.3131.0",
"OSName/Windows10Enterprise",
"OSVersion/6.3.16299",
"OSVersion/6.3.17134",
"Microsoft.Azure.Management.ManagementPartner.ACEProvisioningManagementPartnerAPIClient/0.0.0.0"
]
},
"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}",
"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}",
"ResponseHeaders": {
"Content-Length": [
"391"
"434"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -37,34 +37,34 @@
"Accept-Encoding"
],
"x-ms-ratelimit-remaining-tenant-writes": [
"1194"
"1199"
],
"request-id": [
"3ab09812-d5ce-45d9-9f0c-eb1213566cf7"
"7d3498ff-ef8c-44e8-957f-89694c5dac70"
],
"x-gsm": [
"8.1.0.50 (AD-CAB-Provisioning:stage.ef4dadac6.180207-2231)"
"8.6.0.6 (AD-CAB-Provisioning:master.4ee42e748.180717-2225)"
],
"x-content-type-options": [
"X-Content-Type-Options": [
"nosniff"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-request-id": [
"9a9ebc4a-d7cb-453b-ab89-c3563e1ab6ae"
"f9a784f7-1ca8-4d9d-8956-70701ac959f8"
],
"x-ms-correlation-request-id": [
"9a9ebc4a-d7cb-453b-ab89-c3563e1ab6ae"
"f9a784f7-1ca8-4d9d-8956-70701ac959f8"
],
"x-ms-routing-request-id": [
"CENTRALUS:20180207T234906Z:9a9ebc4a-d7cb-453b-ab89-c3563e1ab6ae"
"WESTUS2:20180730T210454Z:f9a784f7-1ca8-4d9d-8956-70701ac959f8"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Wed, 07 Feb 2018 23:49:06 GMT"
"Mon, 30 Jul 2018 21:04:53 GMT"
],
"Server": [
"Microsoft-IIS/8.5"
Expand All @@ -73,28 +73,28 @@
"StatusCode": 200
},
{
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/123457?api-version=2018-02-01",
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvMTIzNDU3P2FwaS12ZXJzaW9uPTIwMTgtMDItMDE=",
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/5127255?api-version=2018-02-01",
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvNTEyNzI1NT9hcGktdmVyc2lvbj0yMDE4LTAyLTAx",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"357f38e5-e9f8-457e-8a4d-484385381352"
"f2788f72-e30c-4558-8773-94757d2bfd6e"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.7.2600.0",
"FxVersion/4.7.3131.0",
"OSName/Windows10Enterprise",
"OSVersion/6.3.16299",
"OSVersion/6.3.17134",
"Microsoft.Azure.Management.ManagementPartner.ACEProvisioningManagementPartnerAPIClient/0.0.0.0"
]
},
"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}",
"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}",
"ResponseHeaders": {
"Content-Length": [
"391"
"434"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -109,34 +109,34 @@
"Accept-Encoding"
],
"x-ms-ratelimit-remaining-tenant-reads": [
"14954"
"14999"
],
"request-id": [
"aad599d0-3008-4ec5-8cd7-74e92edcdf16"
"45a970c3-bc0e-4606-9347-e0a607fbaee2"
],
"x-gsm": [
"8.1.0.50 (AD-CAB-Provisioning:stage.ef4dadac6.180207-2231)"
"8.6.0.6 (AD-CAB-Provisioning:master.4ee42e748.180717-2225)"
],
"x-content-type-options": [
"X-Content-Type-Options": [
"nosniff"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-request-id": [
"57782269-bbac-4e08-bfca-d90d1e83ed62"
"33b6a2fc-6830-47c9-9a4e-6ccf681c6845"
],
"x-ms-correlation-request-id": [
"57782269-bbac-4e08-bfca-d90d1e83ed62"
"33b6a2fc-6830-47c9-9a4e-6ccf681c6845"
],
"x-ms-routing-request-id": [
"CENTRALUS:20180207T234906Z:57782269-bbac-4e08-bfca-d90d1e83ed62"
"WESTUS2:20180730T210455Z:33b6a2fc-6830-47c9-9a4e-6ccf681c6845"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Wed, 07 Feb 2018 23:49:06 GMT"
"Mon, 30 Jul 2018 21:04:54 GMT"
],
"Server": [
"Microsoft-IIS/8.5"
Expand All @@ -145,21 +145,21 @@
"StatusCode": 200
},
{
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/123457?api-version=2018-02-01",
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvMTIzNDU3P2FwaS12ZXJzaW9uPTIwMTgtMDItMDE=",
"RequestUri": "/providers/Microsoft.ManagementPartner/partners/5127255?api-version=2018-02-01",
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudFBhcnRuZXIvcGFydG5lcnMvNTEyNzI1NT9hcGktdmVyc2lvbj0yMDE4LTAyLTAx",
"RequestMethod": "DELETE",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"a0b4bc09-e932-4b9f-9568-a18fe7d81a8a"
"a477411d-6202-4b09-b5b7-4b12e0cbfc29"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.7.2600.0",
"FxVersion/4.7.3131.0",
"OSName/Windows10Enterprise",
"OSVersion/6.3.16299",
"OSVersion/6.3.17134",
"Microsoft.Azure.Management.ManagementPartner.ACEProvisioningManagementPartnerAPIClient/0.0.0.0"
]
},
Expand All @@ -175,34 +175,34 @@
"no-cache"
],
"request-id": [
"ca4c6f14-a6a8-41b8-9c1a-726cbc1f828a"
"5537da65-bb24-4e0a-abf4-cf7f883a797d"
],
"x-gsm": [
"8.1.0.50 (AD-CAB-Provisioning:stage.ef4dadac6.180207-2231)"
"8.6.0.6 (AD-CAB-Provisioning:master.4ee42e748.180717-2225)"
],
"x-content-type-options": [
"X-Content-Type-Options": [
"nosniff"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-tenant-writes": [
"1193"
"1198"
],
"x-ms-request-id": [
"a6bc8f2f-19a6-48b1-bc7d-1d0e694c3dee"
"d34bdcab-96e3-4eaa-871d-95b8112d96d8"
],
"x-ms-correlation-request-id": [
"a6bc8f2f-19a6-48b1-bc7d-1d0e694c3dee"
"d34bdcab-96e3-4eaa-871d-95b8112d96d8"
],
"x-ms-routing-request-id": [
"CENTRALUS:20180207T234906Z:a6bc8f2f-19a6-48b1-bc7d-1d0e694c3dee"
"WESTUS2:20180730T210455Z:d34bdcab-96e3-4eaa-871d-95b8112d96d8"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Wed, 07 Feb 2018 23:49:06 GMT"
"Mon, 30 Jul 2018 21:04:55 GMT"
],
"Server": [
"Microsoft-IIS/8.5"
Expand All @@ -213,8 +213,6 @@
],
"Names": {},
"Variables": {
"SubscriptionId": "d14e8666-b43e-4f12-aa78-06c49c4859de",
"TenantId": "1b1121dd-6900-412a-af73-e8d44f81e1c1",
"Domain": ""
"SubscriptionId": "5f706f09-5aaf-41ca-9e05-1f1950e6df41"
}
}
Loading