Skip to content

Commit b5a2fbc

Browse files
onetocnyonetocny
authored
Set USE_MSAL to false in unit tests (#18064)
* Set USE_MSAL to false in tests * Remove useMsal param from AzureRmWebAppDeploymentProvider * Clean up msal paramteres * Bump up version
1 parent 01a5f52 commit b5a2fbc

17 files changed

+797
-1015
lines changed

‎Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderL0Tests.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class AzureRmWebAppDeploymentProviderL0Tests {
2424
try {
2525
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
2626
var azureRmWebAppDeploymentProvider : AzureRmWebAppDeploymentProvider = new AzureRmWebAppDeploymentProvider(taskParameters);
27-
await azureRmWebAppDeploymentProvider.PreDeploymentStep(false);
27+
await azureRmWebAppDeploymentProvider.PreDeploymentStep();
2828
} catch(error) {
2929
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps should succeeded but failed with error');
3030
}
@@ -36,7 +36,7 @@ export class AzureRmWebAppDeploymentProviderL0Tests {
3636
taskParameters.DeployToSlotOrASEFlag = true;
3737
taskParameters.ResourceGroupName = "MOCK_RESOURCE_GROUP_NAME";
3838
var azureRmWebAppDeploymentProvider : AzureRmWebAppDeploymentProvider = new AzureRmWebAppDeploymentProvider(taskParameters);
39-
await azureRmWebAppDeploymentProvider.PreDeploymentStep(false);
39+
await azureRmWebAppDeploymentProvider.PreDeploymentStep();
4040
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps with slot enabled should succeeded');
4141
} catch(error) {
4242
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps with slot enabled failed with error');
@@ -50,7 +50,7 @@ export class AzureRmWebAppDeploymentProviderL0Tests {
5050
taskParameters.ResourceGroupName = "MOCK_RESOURCE_GROUP_NAME";
5151
taskParameters.VirtualApplication = "VirtualApplication";
5252
var azureRmWebAppDeploymentProvider : AzureRmWebAppDeploymentProvider = new AzureRmWebAppDeploymentProvider(taskParameters);
53-
await azureRmWebAppDeploymentProvider.PreDeploymentStep(false);
53+
await azureRmWebAppDeploymentProvider.PreDeploymentStep();
5454
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps with virtual application should succeeded');
5555
} catch(error) {
5656
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps with virtual application failed with error');
@@ -61,7 +61,7 @@ export class AzureRmWebAppDeploymentProviderL0Tests {
6161
try {
6262
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
6363
var azureRmWebAppDeploymentProvider : AzureRmWebAppDeploymentProvider = new AzureRmWebAppDeploymentProvider(taskParameters);
64-
await azureRmWebAppDeploymentProvider.PreDeploymentStep(false);
64+
await azureRmWebAppDeploymentProvider.PreDeploymentStep();
6565
await azureRmWebAppDeploymentProvider.UpdateDeploymentStatus(true);
6666
} catch(error) {
6767
tl.setResult(tl.TaskResult.Failed, 'UpdateDeploymentStatus steps should succeeded but failed with error');

‎Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderL0Tests.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class BuiltInLinuxWebAppDeploymentProviderL0Tests {
2828
try {
2929
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
3030
var builtInLinuxWebAppDeploymentProvider : BuiltInLinuxWebAppDeploymentProvider = new BuiltInLinuxWebAppDeploymentProvider(taskParameters);
31-
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep(false);
31+
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep();
3232
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for built in linux web app should succeeded');
3333
} catch(error) {
3434
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for built in linux web app failed with error');
@@ -41,7 +41,7 @@ export class BuiltInLinuxWebAppDeploymentProviderL0Tests {
4141
taskParameters.DeployToSlotOrASEFlag = true;
4242
taskParameters.ResourceGroupName = "MOCK_RESOURCE_GROUP_NAME";
4343
var builtInLinuxWebAppDeploymentProvider : BuiltInLinuxWebAppDeploymentProvider = new BuiltInLinuxWebAppDeploymentProvider(taskParameters);
44-
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep(false);
44+
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep();
4545
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for built in linux web app with slot enabled should succeeded');
4646
} catch(error) {
4747
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for built in linux web app with slot enabled failed with error');
@@ -52,7 +52,7 @@ export class BuiltInLinuxWebAppDeploymentProviderL0Tests {
5252
try {
5353
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
5454
var builtInLinuxWebAppDeploymentProvider : BuiltInLinuxWebAppDeploymentProvider = new BuiltInLinuxWebAppDeploymentProvider(taskParameters);
55-
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep(false);
55+
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep();
5656
await builtInLinuxWebAppDeploymentProvider.UpdateDeploymentStatus(true);
5757
} catch(error) {
5858
tl.setResult(tl.TaskResult.Failed, 'UpdateDeploymentStatus for built in linux web app steps should succeeded but failed with error');
@@ -63,7 +63,7 @@ export class BuiltInLinuxWebAppDeploymentProviderL0Tests {
6363
try {
6464
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
6565
var builtInLinuxWebAppDeploymentProvider : BuiltInLinuxWebAppDeploymentProvider = new BuiltInLinuxWebAppDeploymentProvider(taskParameters);
66-
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep(false);
66+
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep();
6767
await builtInLinuxWebAppDeploymentProvider.DeployWebAppStep();
6868
tl.setResult(tl.TaskResult.Succeeded, 'DeployWebAppStep for built in linux web app steps with zip package succeeded');
6969
} catch(error) {
@@ -77,7 +77,7 @@ export class BuiltInLinuxWebAppDeploymentProviderL0Tests {
7777
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.folder};
7878
taskParameters.Package.getPath = () :string => { return "webAppPkg" };
7979
var builtInLinuxWebAppDeploymentProvider : BuiltInLinuxWebAppDeploymentProvider = new BuiltInLinuxWebAppDeploymentProvider(taskParameters);
80-
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep(false);
80+
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep();
8181
await builtInLinuxWebAppDeploymentProvider.DeployWebAppStep();
8282
tl.setResult(tl.TaskResult.Succeeded, 'DeployWebAppStep for built in linux web app steps with folder package succeeded');
8383
} catch(error) {
@@ -91,7 +91,7 @@ export class BuiltInLinuxWebAppDeploymentProviderL0Tests {
9191
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.war};
9292
taskParameters.Package.getPath = () :string => { return "webAppPkg.war" };
9393
var builtInLinuxWebAppDeploymentProvider : BuiltInLinuxWebAppDeploymentProvider = new BuiltInLinuxWebAppDeploymentProvider(taskParameters);
94-
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep(false);
94+
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep();
9595
await builtInLinuxWebAppDeploymentProvider.DeployWebAppStep();
9696
tl.setResult(tl.TaskResult.Succeeded, 'DeployWebAppStep for built in linux web app steps with war package succeeded');
9797
} catch(error) {
@@ -105,7 +105,7 @@ export class BuiltInLinuxWebAppDeploymentProviderL0Tests {
105105
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.jar};
106106
taskParameters.Package.getPath = () :string => { return "webAppPkg.jar" };
107107
var builtInLinuxWebAppDeploymentProvider : BuiltInLinuxWebAppDeploymentProvider = new BuiltInLinuxWebAppDeploymentProvider(taskParameters);
108-
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep(false);
108+
await builtInLinuxWebAppDeploymentProvider.PreDeploymentStep();
109109
await builtInLinuxWebAppDeploymentProvider.DeployWebAppStep();
110110
tl.setResult(tl.TaskResult.Succeeded, 'DeployWebAppStep for built in linux web app steps with jar package succeeded');
111111
} catch(error) {

‎Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderL0Tests.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class ContainerWebAppDeploymentProviderL0Tests {
2525
try {
2626
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
2727
var containerWebAppDeploymentProvider : ContainerWebAppDeploymentProvider = new ContainerWebAppDeploymentProvider(taskParameters);
28-
await containerWebAppDeploymentProvider.PreDeploymentStep(false);
28+
await containerWebAppDeploymentProvider.PreDeploymentStep();
2929
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for container web app should succeeded');
3030
} catch(error) {
3131
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for container web app failed with error');
@@ -38,7 +38,7 @@ export class ContainerWebAppDeploymentProviderL0Tests {
3838
taskParameters.DeployToSlotOrASEFlag = true;
3939
taskParameters.ResourceGroupName = "MOCK_RESOURCE_GROUP_NAME";
4040
var containerWebAppDeploymentProvider : ContainerWebAppDeploymentProvider = new ContainerWebAppDeploymentProvider(taskParameters);
41-
await containerWebAppDeploymentProvider.PreDeploymentStep(false);
41+
await containerWebAppDeploymentProvider.PreDeploymentStep();
4242
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for container web app with slot enabled should succeeded');
4343
} catch(error) {
4444
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for container web app with slot enabled failed with error');
@@ -49,7 +49,7 @@ export class ContainerWebAppDeploymentProviderL0Tests {
4949
try {
5050
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
5151
var containerWebAppDeploymentProvider : ContainerWebAppDeploymentProvider = new ContainerWebAppDeploymentProvider(taskParameters);
52-
await containerWebAppDeploymentProvider.PreDeploymentStep(false);
52+
await containerWebAppDeploymentProvider.PreDeploymentStep();
5353
await containerWebAppDeploymentProvider.UpdateDeploymentStatus(true);
5454
} catch(error) {
5555
tl.setResult(tl.TaskResult.Failed, 'UpdateDeploymentStatus for container web app steps should succeeded but failed with error');
@@ -61,7 +61,7 @@ export class ContainerWebAppDeploymentProviderL0Tests {
6161
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
6262
taskParameters.ScriptType = null;
6363
var containerWebAppDeploymentProvider : ContainerWebAppDeploymentProvider = new ContainerWebAppDeploymentProvider(taskParameters);
64-
await containerWebAppDeploymentProvider.PreDeploymentStep(false);
64+
await containerWebAppDeploymentProvider.PreDeploymentStep();
6565
await containerWebAppDeploymentProvider.DeployWebAppStep();
6666
tl.setResult(tl.TaskResult.Succeeded, 'Web app Deployment steps for container should succeeded');
6767
} catch(error) {

‎Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderL0Tests.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class WindowsWebAppRunFromZipProviderL0Tests {
2626
try {
2727
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
2828
var windowsWebAppRunFromZipProvider : WindowsWebAppRunFromZipProvider = new WindowsWebAppRunFromZipProvider(taskParameters);
29-
await windowsWebAppRunFromZipProvider.PreDeploymentStep(false);
29+
await windowsWebAppRunFromZipProvider.PreDeploymentStep();
3030
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for run from zip should succeeded');
3131
} catch(error) {
3232
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for built in run from zip failed with error');
@@ -39,7 +39,7 @@ export class WindowsWebAppRunFromZipProviderL0Tests {
3939
taskParameters.DeployToSlotOrASEFlag = true;
4040
taskParameters.ResourceGroupName = "MOCK_RESOURCE_GROUP_NAME";
4141
var windowsWebAppRunFromZipProvider : WindowsWebAppRunFromZipProvider = new WindowsWebAppRunFromZipProvider(taskParameters);
42-
await windowsWebAppRunFromZipProvider.PreDeploymentStep(false);
42+
await windowsWebAppRunFromZipProvider.PreDeploymentStep();
4343
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for run from zip with slot enabled should succeeded');
4444
} catch(error) {
4545
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for run from zip with slot enabled failed with error');
@@ -51,7 +51,7 @@ export class WindowsWebAppRunFromZipProviderL0Tests {
5151
var taskParameters: TaskParameters = TaskParametersUtility.getParameters();
5252
taskParameters.ScriptType = "Run Script";
5353
var windowsWebAppRunFromZipProvider : WindowsWebAppRunFromZipProvider = new WindowsWebAppRunFromZipProvider(taskParameters);
54-
await windowsWebAppRunFromZipProvider.PreDeploymentStep(false);
54+
await windowsWebAppRunFromZipProvider.PreDeploymentStep();
5555
await windowsWebAppRunFromZipProvider.UpdateDeploymentStatus(true);
5656
} catch(error) {
5757
tl.setResult(tl.TaskResult.Failed, 'UpdateDeploymentStatus for run from zip steps should succeeded but failed with error');
@@ -64,7 +64,7 @@ export class WindowsWebAppRunFromZipProviderL0Tests {
6464
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.zip};
6565
taskParameters.Package.getPath = () :string => { return "webAppPkg.zip" };
6666
var windowsWebAppRunFromZipProvider : WindowsWebAppRunFromZipProvider = new WindowsWebAppRunFromZipProvider(taskParameters);
67-
await windowsWebAppRunFromZipProvider.PreDeploymentStep(false);
67+
await windowsWebAppRunFromZipProvider.PreDeploymentStep();
6868
await windowsWebAppRunFromZipProvider.DeployWebAppStep();
6969
tl.setResult(tl.TaskResult.Succeeded, 'DeployWebAppStep for run from zip steps with zip package succeeded');
7070
} catch(error) {
@@ -78,7 +78,7 @@ export class WindowsWebAppRunFromZipProviderL0Tests {
7878
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.folder};
7979
taskParameters.Package.getPath = () :string => { return "webAppPkg" };
8080
var windowsWebAppRunFromZipProvider : WindowsWebAppRunFromZipProvider = new WindowsWebAppRunFromZipProvider(taskParameters);
81-
await windowsWebAppRunFromZipProvider.PreDeploymentStep(false);
81+
await windowsWebAppRunFromZipProvider.PreDeploymentStep();
8282
await windowsWebAppRunFromZipProvider.DeployWebAppStep();
8383
tl.setResult(tl.TaskResult.Succeeded, 'DeployWebAppStep for run from zip steps with folder package succeeded');
8484
} catch(error) {

‎Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderL0Tests.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class WindowsWebAppWarDeployProviderL0Tests {
2727
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.war};
2828
taskParameters.Package.getPath = () :string => { return "webAppPkg.war" };
2929
var windowsWebAppWarDeployProvider : WindowsWebAppWarDeployProvider = new WindowsWebAppWarDeployProvider(taskParameters);
30-
await windowsWebAppWarDeployProvider.PreDeploymentStep(false);
30+
await windowsWebAppWarDeployProvider.PreDeploymentStep();
3131
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for war deploy should succeeded');
3232
} catch(error) {
3333
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for war deploy failed with error');
@@ -42,7 +42,7 @@ export class WindowsWebAppWarDeployProviderL0Tests {
4242
taskParameters.DeployToSlotOrASEFlag = true;
4343
taskParameters.ResourceGroupName = "MOCK_RESOURCE_GROUP_NAME";
4444
var windowsWebAppWarDeployProvider : WindowsWebAppWarDeployProvider = new WindowsWebAppWarDeployProvider(taskParameters);
45-
await windowsWebAppWarDeployProvider.PreDeploymentStep(false);
45+
await windowsWebAppWarDeployProvider.PreDeploymentStep();
4646
tl.setResult(tl.TaskResult.Succeeded, 'PreDeployment steps for war deploy with slot enabled should succeeded');
4747
} catch(error) {
4848
tl.setResult(tl.TaskResult.Failed, 'PreDeployment steps for war deploy with slot enabled failed with error');
@@ -55,7 +55,7 @@ export class WindowsWebAppWarDeployProviderL0Tests {
5555
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.war};
5656
taskParameters.Package.getPath = () :string => { return "webAppPkg.war" };
5757
var windowsWebAppWarDeployProvider : WindowsWebAppWarDeployProvider = new WindowsWebAppWarDeployProvider(taskParameters);
58-
await windowsWebAppWarDeployProvider.PreDeploymentStep(false);
58+
await windowsWebAppWarDeployProvider.PreDeploymentStep();
5959
await windowsWebAppWarDeployProvider.UpdateDeploymentStatus(true);
6060
} catch(error) {
6161
tl.setResult(tl.TaskResult.Failed, 'UpdateDeploymentStatus for war deploy steps should succeeded but failed with error');
@@ -68,7 +68,7 @@ export class WindowsWebAppWarDeployProviderL0Tests {
6868
taskParameters.Package.getPackageType = () :PackageType => {return PackageType.war};
6969
taskParameters.Package.getPath = () :string => { return "webAppPkg.war" };
7070
var windowsWebAppWarDeployProvider : WindowsWebAppWarDeployProvider = new WindowsWebAppWarDeployProvider(taskParameters);
71-
await windowsWebAppWarDeployProvider.PreDeploymentStep(false);
71+
await windowsWebAppWarDeployProvider.PreDeploymentStep();
7272
await windowsWebAppWarDeployProvider.DeployWebAppStep();
7373
tl.setResult(tl.TaskResult.Succeeded, 'DeployWebAppStep for war deploy steps with war package succeeded');
7474
} catch(error) {

0 commit comments

Comments
 (0)