@@ -61,7 +61,6 @@ public static class ScenarioTestHelpers
61
61
internal const string MpiSetupFileLocalPath = "Resources\\ MSMpiSetup.exe" ;
62
62
internal const string StorageAccountEnvVar = "AZURE_STORAGE_ACCOUNT" ;
63
63
internal const string StorageKeyEnvVar = "AZURE_STORAGE_ACCESS_KEY" ;
64
- public static string StorageResourceId = "AZURE_BATCH_STORAGE_ID" ;
65
64
66
65
internal const string BatchAccountName = "AZURE_BATCH_ACCOUNT" ;
67
66
internal const string BatchAccountKey = "AZURE_BATCH_ACCESS_KEY" ;
@@ -99,9 +98,9 @@ public static string AddTestCertificate(BatchController controller, BatchAccount
99
98
BatchClient client = new BatchClient ( controller . BatchManagementClient , controller . ResourceManagementClient ) ;
100
99
101
100
X509Certificate2 cert = new X509Certificate2 ( filePath ) ;
102
- ListCertificateOptions getParameters = new ListCertificateOptions ( context )
103
- {
104
- ThumbprintAlgorithm = BatchTestHelpers . TestCertificateAlgorithm ,
101
+ ListCertificateOptions getParameters = new ListCertificateOptions ( context )
102
+ {
103
+ ThumbprintAlgorithm = BatchTestHelpers . TestCertificateAlgorithm ,
105
104
Thumbprint = cert . Thumbprint ,
106
105
Select = "thumbprint,state"
107
106
} ;
@@ -182,7 +181,7 @@ public static void WaitForCertificateToFailDeletion(BatchController controller,
182
181
/// <summary>
183
182
/// Creates a test pool for use in Scenario tests.
184
183
/// </summary>
185
- public static void CreateTestPool ( BatchController controller , BatchAccountContext context , string poolId , int targetDedicated ,
184
+ public static void CreateTestPool ( BatchController controller , BatchAccountContext context , string poolId , int targetDedicated ,
186
185
CertificateReference certReference = null , StartTask startTask = null )
187
186
{
188
187
BatchClient client = new BatchClient ( controller . BatchManagementClient , controller . ResourceManagementClient ) ;
@@ -199,7 +198,7 @@ public static void CreateTestPool(BatchController controller, BatchAccountContex
199
198
}
200
199
201
200
PSCloudServiceConfiguration paasConfiguration = new PSCloudServiceConfiguration ( "4" , "*" ) ;
202
-
201
+
203
202
NewPoolParameters parameters = new NewPoolParameters ( context , poolId )
204
203
{
205
204
VirtualMachineSize = "small" ,
@@ -462,7 +461,7 @@ public static void CreateTestTask(BatchController controller, BatchAccountContex
462
461
MultiInstanceSettings = multiInstanceSettings ,
463
462
RunElevated = numInstances <= 1
464
463
} ;
465
-
464
+
466
465
client . CreateTask ( parameters ) ;
467
466
}
468
467
0 commit comments