Skip to content

Commit 1b3a72a

Browse files
huangpfhuangpf
committed
Update Test
1 parent 376bddd commit 1b3a72a

File tree

2 files changed

+103
-37
lines changed

2 files changed

+103
-37
lines changed

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 102 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -423,68 +423,134 @@
423423
<None Include="AzureRTExtensions.playlist" />
424424
<None Include="AzureRTFull.playlist" />
425425
<None Include="Resources\HelloWorld_SDK20.cspkg">
426-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
426+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
427427
</None>
428428
<None Include="Resources\ServiceConfiguration.cscfg">
429-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
429+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
430430
</None>
431431
<None Include="MSSharedLibKey.snk" />
432432
<None Include="packages.config" />
433-
<None Include="Resources\affinityGroupData.csv" />
434-
<None Include="Resources\certificateData.csv" />
433+
<None Include="Resources\affinityGroupData.csv">
434+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
435+
</None>
436+
<None Include="Resources\certificateData.csv">
437+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
438+
</None>
435439
<None Include="Resources\CustomData.bin">
436440
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
437441
</None>
438442
<None Include="Resources\cloudinittest.sh">
439443
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
440444
</None>
441-
<None Include="Resources\download_VHD.csv" />
445+
<None Include="Resources\download_VHD.csv">
446+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
447+
</None>
442448
<None Include="Resources\DSC\DscExtensionTestConfigurationData.psd1" />
443-
<None Include="Resources\HelloNoDiag.cscfg" />
449+
<None Include="Resources\HelloNoDiag.cscfg">
450+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
451+
</None>
444452
<None Include="Resources\nodiagpackage.csv">
445453
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
446454
</None>
447-
<None Include="Resources\OneWebOneWorker.cscfg" />
448-
<None Include="Resources\OneWebOneWorkerRDP.cscfg" />
449-
<None Include="Resources\overwrite_VHD.csv" />
455+
<None Include="Resources\OneWebOneWorker.cscfg">
456+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
457+
</None>
458+
<None Include="Resources\OneWebOneWorkerRDP.cscfg">
459+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
460+
</None>
461+
<None Include="Resources\overwrite_VHD.csv">
462+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
463+
</None>
450464
<None Include="Resources\package.csv">
451465
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
452466
</None>
453-
<None Include="Resources\packageADDomain.csv" />
454-
<None Include="Resources\packageReservedIP.csv" />
455-
<None Include="Resources\packageScenario.csv" />
456-
<None Include="Resources\patch_VHD.csv" />
457-
<None Include="Resources\rdpcert.pfx" />
458-
<None Include="Resources\ReservedIPConfig1.cscfg" />
459-
<None Include="Resources\ReservedIPConfig1update.cscfg" />
460-
<None Include="Resources\ReservedIPConfig2.cscfg" />
461-
<None Include="Resources\ReservedIPConfig2update.cscfg" />
462-
<None Include="Resources\resume_VHD.csv" />
463-
<None Include="Resources\SampleAppV1.cscfg" />
464-
<None Include="Resources\SampleAppV2.cscfg" />
465-
<None Include="Resources\SampleAppV3.cscfg" />
466-
<None Include="Resources\StaticCAvnetconfig.netcfg" />
467-
<None Include="Resources\storageAccountTestData.csv" />
467+
<None Include="Resources\packageADDomain.csv">
468+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
469+
</None>
470+
<None Include="Resources\packageReservedIP.csv">
471+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
472+
</None>
473+
<None Include="Resources\packageScenario.csv">
474+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
475+
</None>
476+
<None Include="Resources\patch_VHD.csv">
477+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
478+
</None>
479+
<None Include="Resources\rdpcert.pfx">
480+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
481+
</None>
482+
<None Include="Resources\ReservedIPConfig1.cscfg">
483+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
484+
</None>
485+
<None Include="Resources\ReservedIPConfig1update.cscfg">
486+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
487+
</None>
488+
<None Include="Resources\ReservedIPConfig2.cscfg">
489+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
490+
</None>
491+
<None Include="Resources\ReservedIPConfig2update.cscfg">
492+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
493+
</None>
494+
<None Include="Resources\resume_VHD.csv">
495+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
496+
</None>
497+
<None Include="Resources\SampleAppV1.cscfg">
498+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
499+
</None>
500+
<None Include="Resources\SampleAppV2.cscfg">
501+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
502+
</None>
503+
<None Include="Resources\SampleAppV3.cscfg">
504+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
505+
</None>
506+
<None Include="Resources\StaticCAvnetconfig.netcfg">
507+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
508+
</None>
509+
<None Include="Resources\storageAccountTestData.csv">
510+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
511+
</None>
468512
<None Include="Resources\DSC\DscExtensionTestConfiguration.ps1" />
469-
<None Include="Resources\test1.ps1" />
470-
<None Include="Resources\test2.ps1" />
471-
<None Include="Resources\thread_VHD.csv" />
472-
<None Include="Resources\upload_VHD.csv" />
473-
<None Include="Resources\vnetconfig.netcfg" />
513+
<None Include="Resources\test1.ps1">
514+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
515+
</None>
516+
<None Include="Resources\test2.ps1">
517+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
518+
</None>
519+
<None Include="Resources\thread_VHD.csv">
520+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
521+
</None>
522+
<None Include="Resources\upload_VHD.csv">
523+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
524+
</None>
525+
<None Include="Resources\vnetconfig.netcfg">
526+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
527+
</None>
474528
<None Include="Resources\VnetconfigWithLocation.netcfg">
475-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
529+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
530+
</None>
531+
<None Include="Resources\wrongPara_VHD.csv">
532+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
476533
</None>
477-
<None Include="Resources\wrongPara_VHD.csv" />
478534
</ItemGroup>
479535
<ItemGroup>
480536
<Content Include="FunctionalTests\ExtensionTests\MicrosoftAntimalware\AntimalwareConfig.xml" />
481537
<Content Include="FunctionalTests\Readme.txt" />
482538
<Content Include="lib\Security.Cryptography.dll" />
483-
<Content Include="Resources\clxtshar.dll" />
484-
<Content Include="Resources\da.xml" />
485-
<Content Include="Resources\PrivateConfig.xml" />
486-
<Content Include="Resources\PublicConfig.xml" />
487-
<Content Include="Resources\VmAccessExtensionConfiguration.xml" />
539+
<Content Include="Resources\clxtshar.dll">
540+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
541+
</Content>
542+
<Content Include="Resources\da.xml">
543+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
544+
</Content>
545+
<Content Include="Resources\PrivateConfig.xml">
546+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
547+
</Content>
548+
<Content Include="Resources\PublicConfig.xml">
549+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
550+
</Content>
551+
<Content Include="Resources\VmAccessExtensionConfiguration.xml">
552+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
553+
</Content>
488554
</ItemGroup>
489555
<ItemGroup>
490556
<Folder Include="TestScripts\" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ public void AzureDeploymentTest()
596596
Utilities.RetryActionUntilSuccess(() =>
597597
{
598598
vmPowershellCmdlets.NewAzureDeployment(serviceName, packagePath1.FullName, configPath1.FullName, DeploymentSlotType.Staging, deploymentLabel, deploymentName, false, false, rdpExtCfg);
599-
}, "Windows Azure is currently performing an operation on this hosted service that requires exclusive access.", 10, 30);
599+
}, "already exists under service", 10, 60);
600600

601601
result = vmPowershellCmdlets.GetAzureDeployment(serviceName, DeploymentSlotType.Staging);
602602
pass = Utilities.PrintAndCompareDeployment(result, serviceName, deploymentName, deploymentLabel, DeploymentSlotType.Staging, null, 1);

0 commit comments

Comments
 (0)