Skip to content

Commit 7538f48

Browse files
cormacpaynecormacpayne
authored
Merge pull request #5431 from cormacpayne/update-test-mappings
Update TestMappings.json and fix broken RecoveryServices.Backup tests
2 parents a26044a + 7e5ddbe commit 7538f48

File tree

4 files changed

+62
-49
lines changed

4 files changed

+62
-49
lines changed

‎TestMappings.json

Lines changed: 52 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,24 @@
22
".github": [],
33
"documentation": [],
44
"setup": [],
5-
"src/ResourceManager/AnalysisServices/": [],
5+
".gitattributes": [],
6+
"CONTRIBUTING.md": [],
7+
"ChangeLog.md": [],
8+
"LICENSE.txt": [],
9+
"README.md": [],
10+
"appveyor.yml": [],
11+
"src/Common/Commands.Common.Authentication.Test/": [
12+
".\\src\\Common\\Commands.Common.Authentication.Test\\bin\\Debug\\Microsoft.Azure.Commands.Common.Authentication.Test.dll"
13+
],
14+
"src/ResourceManager/AnalysisServices/": [
15+
".\\src\\ResourceManager\\AnalysisServices\\Commands.AnalysisServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.AnalysisServices.Test.dll"
16+
],
617
"src/ResourceManager/ApiManagement/": [
718
".\\src\\ResourceManager\\ApiManagement\\Commands.ApiManagement.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApiManagement.Test.dll"
819
],
20+
"src/ResourceManager/ApplicationInsights/": [
21+
".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"
22+
],
923
"src/ResourceManager/Automation/": [
1024
".\\src\\ResourceManager\\Automation\\Commands.Automation.Test\\bin\\Debug\\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"
1125
],
@@ -15,7 +29,6 @@
1529
"src/ResourceManager/AzureBatch/": [
1630
".\\src\\ResourceManager\\AzureBatch\\Commands.Batch.Test\\bin\\Debug\\Microsoft.Azure.Commands.Batch.Test.dll"
1731
],
18-
"src/ResourceManager/AzureStackStorage/": [],
1932
"src/ResourceManager/Billing/": [
2033
".\\src\\ResourceManager\\Billing\\Commands.Billing.Test\\bin\\Debug\\Microsoft.Azure.Commands.Billing.Test.dll"
2134
],
@@ -26,17 +39,24 @@
2639
".\\src\\ResourceManager\\CognitiveServices\\CognitiveServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"
2740
],
2841
"src/ResourceManager/Compute/": [
29-
".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll"
42+
".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
43+
".\\src\\ResourceManager\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.Azure.Commands.Network.Test.dll",
44+
".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
45+
".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll"
3046
],
3147
"src/ResourceManager/Consumption/": [
3248
".\\src\\ResourceManager\\Consumption\\Commands.Consumption.Test\\bin\\Debug\\Microsoft.Azure.Commands.Consumption.Test.dll"
3349
],
50+
"src/ResourceManager/ContainerInstance/": [
51+
".\\src\\ResourceManager\\ContainerInstance\\Commands.ContainerInstance.Test\\bin\\Debug\\Microsoft.Azure.Commands.ContainerInstance.Test.dll"
52+
],
3453
"src/ResourceManager/ContainerRegistry/": [
3554
".\\src\\ResourceManager\\ContainerRegistry\\Commands.ContainerRegistry.Test\\bin\\Debug\\Microsoft.Azure.Commands.ContainerRegistry.Test.dll"
3655
],
3756
"src/ResourceManager/DataFactories/": [
3857
".\\src\\ResourceManager\\DataFactories\\Commands.DataFactories.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactories.Test.dll",
39-
".\\src\\ResourceManager\\DataFactories\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll"
58+
".\\src\\ResourceManager\\DataFactories\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll",
59+
".\\src\\ResourceManager\\StreamAnalytics\\Commands.StreamAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"
4060
],
4161
"src/ResourceManager/DataLakeAnalytics/": [
4262
".\\src\\ResourceManager\\DataLakeAnalytics\\Commands.DataLakeAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"
@@ -55,7 +75,9 @@
5575
".\\src\\ResourceManager\\EventGrid\\Commands.EventGrid.Test\\bin\\Debug\\Microsoft.Azure.Commands.EventGrid.Test.dll"
5676
],
5777
"src/ResourceManager/EventHub/": [
58-
".\\src\\ResourceManager\\EventHub\\Commands.EventHub.Test\\bin\\Debug\\Microsoft.Azure.Commands.EventHubs.Test.dll"
78+
".\\src\\ResourceManager\\EventGrid\\Commands.EventGrid.Test\\bin\\Debug\\Microsoft.Azure.Commands.EventGrid.Test.dll",
79+
".\\src\\ResourceManager\\EventHub\\Commands.EventHub.Test\\bin\\Debug\\Microsoft.Azure.Commands.EventHubs.Test.dll",
80+
".\\src\\ResourceManager\\IotHub\\Commands.IotHub.Test\\bin\\Debug\\Microsoft.Azure.Commands.IotHub.Test.dll"
5981
],
6082
"src/ResourceManager/HDInsight/": [
6183
".\\src\\ResourceManager\\HDInsight\\Commands.HDInsight.Test\\bin\\Debug\\Commands.HDInsight.Test.dll"
@@ -67,7 +89,9 @@
6789
".\\src\\ResourceManager\\IotHub\\Commands.IotHub.Test\\bin\\Debug\\Microsoft.Azure.Commands.IotHub.Test.dll"
6890
],
6991
"src/ResourceManager/KeyVault/": [
70-
".\\src\\ResourceManager\\KeyVault\\Commands.KeyVault.Test\\bin\\Debug\\Microsoft.Azure.Commands.KeyVault.Test.dll"
92+
".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
93+
".\\src\\ResourceManager\\KeyVault\\Commands.KeyVault.Test\\bin\\Debug\\Microsoft.Azure.Commands.KeyVault.Test.dll",
94+
".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll"
7195
],
7296
"src/ResourceManager/LogicApp/": [
7397
".\\src\\ResourceManager\\LogicApp\\Commands.LogicApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.LogicApp.Test.dll"
@@ -76,9 +100,16 @@
76100
"src/ResourceManager/MachineLearningCompute/" : [
77101
".\\src\\ResourceManager\\MachineLearningCompute\\Commands.MachineLearningCompute.Test\\bin\\Debug\\Microsoft.Azure.Commands.MachineLearningCompute.Test.dll"
78102
],
103+
"src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/": [
104+
".\\src\\ResourceManager\\MarketplaceOrdering\\Commands.MarketplaceOrdering.Test\\bin\\Debug\\Microsoft.Azure.Commands.MarketplaceOrdering.Test.dll"
105+
],
79106
"src/ResourceManager/Media/": [],
80107
"src/ResourceManager/Network/": [
81-
".\\src\\ResourceManager\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.Azure.Commands.Network.Test.dll"
108+
".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
109+
".\\src\\ResourceManager\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.Azure.Commands.Network.Test.dll",
110+
".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
111+
".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll",
112+
".\\src\\ResourceManager\\Sql\\Commands.Sql.Test\\bin\\Debug\\Microsoft.Azure.Commands.Sql.Test.dll"
82113
],
83114
"src/ResourceManager/NotificationHubs /": [
84115
".\\src\\ResourceManager\\NotificationHubs\\Commands.NotificationHubs.Test\\bin\\Debug\\Microsoft.Azure.Commands.NotificationHubs.Test.dll"
@@ -89,24 +120,29 @@
89120
"src/ResourceManager/PowerBIEmbedded/": [
90121
".\\src\\ResourceManager\\PowerBIEmbedded\\Commands.PowerBIEmbedded.Test\\bin\\Debug\\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll"
91122
],
123+
"src/ResourceManager/Profile/Commands.Profile.Test/": [
124+
".\\src\\ResourceManager\\Profile\\Commands.Profile.Test\\bin\\Debug\\Microsoft.Azure.Commands.Profile.Test.dll"
125+
],
92126
"src/ResourceManager/RecoveryServices.Backup/": [
93127
".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll"
94128
],
95129
"src/ResourceManager/RecoveryServices/": [
96-
".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"
130+
".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
131+
".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll",
132+
".\\src\\ResourceManager\\SiteRecovery\\Commands.SiteRecovery.Test\\bin\\Debug\\Microsoft.Azure.Commands.SiteRecovery.Test.dll"
97133
],
98134
"src/ResourceManager/RedisCache/": [
99135
".\\src\\ResourceManager\\RedisCache\\Commands.RedisCache.Test\\bin\\Debug\\Microsoft.Azure.Commands.RedisCache.Test.dll"
100136
],
101137
"src/ResourceManager/Relay/": [
102138
".\\src\\ResourceManager\\Relay\\Commands.Relay.Test\\bin\\Debug\\Microsoft.Azure.Commands.Relay.Test.dll"
103139
],
104-
"src/ResourceManager/Resources/": [
105-
".\\src\\ResourceManager\\Resources\\Commands.Resources.Test\\bin\\Debug\\Microsoft.Azure.Commands.Resources.Test.dll"
106-
],
107140
"src/ResourceManager/Reservations/": [
108141
".\\src\\ResourceManager\\Reservations\\Commands.Reservations.Test\\bin\\Debug\\Microsoft.Azure.Commands.Reservations.Test.dll"
109142
],
143+
"src/ResourceManager/Resources/Commands.Resources.Test/": [
144+
".\\src\\ResourceManager\\Resources\\Commands.Resources.Test\\bin\\Debug\\Microsoft.Azure.Commands.Resources.Test.dll"
145+
],
110146
"src/ResourceManager/Scheduler/": [
111147
".\\src\\ResourceManager\\Scheduler\\Commands.Scheduler.Test\\bin\\Debug\\Microsoft.Azure.Commands.Scheduler.Test.dll"
112148
],
@@ -123,7 +159,7 @@
123159
"src/ResourceManager/Sql/": [
124160
".\\src\\ResourceManager\\Sql\\Commands.Sql.Test\\bin\\Debug\\Microsoft.Azure.Commands.Sql.Test.dll"
125161
],
126-
"src/ResourceManager/Storage/": [
162+
"src/ResourceManager/Storage/Commands.Management.Storage.Test/": [
127163
".\\src\\ResourceManager\\Storage\\Commands.Management.Storage.Test\\bin\\Debug\\Microsoft.Azure.Commands.Management.Storage.Test.dll"
128164
],
129165
"src/ResourceManager/StreamAnalytics/": [
@@ -140,6 +176,7 @@
140176
".\\src\\ResourceManager\\UsageAggregates\\Commands.UsageAggregates.Test\\bin\\Debug\\Microsoft.Azure.Commands.UsageAggregates.Test.dll"
141177
],
142178
"src/ResourceManager/Websites/": [
179+
".\\src\\ResourceManager\\LogicApp\\Commands.LogicApp.Test\\bin\\Debug\\Microsoft.Azure.Commands.LogicApp.Test.dll",
143180
".\\src\\ResourceManager\\Websites\\Commands.Websites.Test\\bin\\Debug\\Microsoft.Azure.Commands.Websites.Test.dll"
144181
],
145182
"src/ServiceManagement/": [
@@ -150,38 +187,13 @@
150187
".\\src\\ServiceManagement\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Test.dll",
151188
".\\src\\ServiceManagement\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"
152189
],
153-
"src/Storage/": [
154-
".\\src\\Storage\\Commands.Storage.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Storage.Test.dll",
155-
".\\src\\ResourceManager\\Storage\\Commands.Management.Storage.Test\\bin\\Debug\\Microsoft.Azure.Commands.Management.Storage.Test.dll",
156-
".\\src\\ServiceManagement\\Common\\Commands.Common.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Common.Test.dll",
157-
".\\src\\ServiceManagement\\Services\\Commands.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Test.dll",
158-
".\\src\\ServiceManagement\\StorSimple\\Commands.StorSimple.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll",
159-
".\\src\\ServiceManagement\\Common\\Commands.ScenarioTest\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ScenarioTest.dll",
160-
".\\src\\ServiceManagement\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Test.dll",
161-
".\\src\\ServiceManagement\\Network\\Commands.Network.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"
190+
"src/Storage/Commands.Storage.Test/": [
191+
".\\src\\Storage\\Commands.Storage.Test\\bin\\Debug\\Microsoft.WindowsAzure.Commands.Storage.Test.dll"
162192
],
163193
"tools/StaticAnalysis/": [
164194
".\\tools\\StaticAnalysis\\StaticAnalysis.Test\\bin\\Debug\\StaticAnalysis.Test.dll"
165195
],
166196
"tools/BuildPackagesTask/": [
167197
".\\tools\\BuildPackagesTask\\Microsoft.Azure.Build.Tasks.Test\\bin\\Debug\\Microsoft.Azure.Build.Tasks.Test.dll"
168-
],
169-
".gitattributes": [],
170-
"CONTRIBUTING.md": [],
171-
"ChangeLog.md": [],
172-
"LICENSE.txt": [],
173-
"README.md": [],
174-
"appveyor.yml": [],
175-
"src/Common/Commands.Common.Authentication.Test/": [
176-
".\\src\\Common\\Commands.Common.Authentication.Test\\bin\\Debug\\Microsoft.Azure.Commands.Common.Authentication.Test.dll"
177-
],
178-
"src/ResourceManager/Profile/Commands.Profile.Test/": [
179-
".\\src\\ResourceManager\\Profile\\Commands.Profile.Test\\bin\\Debug\\Microsoft.Azure.Commands.Profile.Test.dll"
180-
],
181-
"src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/": [
182-
".\\src\\ResourceManager\\MarketplaceOrdering\\Commands.MarketplaceOrdering.Test\\bin\\Debug\\Microsoft.Azure.Commands.MarketplaceOrdering.Test.dll"
183-
],
184-
"src/ResourceManager/ApplicationInsights/": [
185-
".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"
186-
]
198+
]
187199
}

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void TestAnalysisServicesServerScaleUpDown()
3939
}
4040

4141
[Fact]
42-
[Trait(Category.AcceptanceType, Category.LiveOnly)]
42+
[Trait(Category.RunType, Category.LiveOnly)]
4343
public void TestAnalysisServicesServerDisableBackup()
4444
{
4545
NewInstance.RunPsTest("Test-AnalysisServicesServerDisableBackup");
@@ -53,28 +53,28 @@ public void TestNegativeAnalysisServicesServer()
5353
}
5454

5555
[Fact]
56-
[Trait(Category.ServiceManagement, Category.LiveOnly)]
56+
[Trait(Category.RunType, Category.LiveOnly)]
5757
public void TestAnalysisServicesServerLogExport()
5858
{
5959
NewInstance.RunPsTest("Test-AnalysisServicesServerLogExport");
6060
}
6161

6262
[Fact]
63-
[Trait(Category.ServiceManagement, Category.LiveOnly)]
63+
[Trait(Category.RunType, Category.LiveOnly)]
6464
public void TestAnalysisServicesServerRestart()
6565
{
6666
NewInstance.RunPsTest("Test-AnalysisServicesServerRestart");
6767
}
6868

6969
[Fact]
70-
[Trait(Category.ServiceManagement, Category.LiveOnly)]
70+
[Trait(Category.RunType, Category.LiveOnly)]
7171
public void TestAnalysisServicesServerSynchronizeSingle()
7272
{
7373
NewInstance.RunPsTest("Test-AnalysisServicesServerSynchronizeSingle");
7474
}
7575

7676
[Fact]
77-
[Trait(Category.ServiceManagement, Category.LiveOnly)]
77+
[Trait(Category.RunType, Category.LiveOnly)]
7878
public void TestAnalysisServicesServerLoginWithSPN()
7979
{
8080
NewInstance.RunPsTest("Test-AnalysisServicesServerLoginWithSPN");

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
<SpecificVersion>False</SpecificVersion>
4141
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Microsoft.Azure.Management.Compute">
44-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.17.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
43+
<Reference Include="Microsoft.Azure.Management.Compute, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.17.3.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
45+
<Private>True</Private>
4546
</Reference>
4647
<Reference Include="Microsoft.Azure.Management.Network, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4748
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Management.Compute" version="17.0.0" targetFramework="net452" />
6+
<package id="Microsoft.Azure.Management.Compute" version="17.3.0" targetFramework="net452" />
77
<package id="Microsoft.Azure.Management.Network" version="15.1.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.RecoveryServices" version="4.2.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="2.1.0-preview" targetFramework="net45" />
@@ -27,4 +27,4 @@
2727
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
2828
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
2929
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
30-
</packages>
30+
</packages>

0 commit comments

Comments
 (0)