@@ -17,16 +17,12 @@ namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Rpc
17
17
{
18
18
public class RpcWorkerConfigFactoryTests : IDisposable
19
19
{
20
- private readonly WorkerProfileManager _profileManager ;
21
20
private TestSystemRuntimeInformation _testSysRuntimeInfo = new TestSystemRuntimeInformation ( ) ;
22
21
private TestEnvironment _testEnvironment ;
23
22
24
23
public RpcWorkerConfigFactoryTests ( )
25
24
{
26
25
_testEnvironment = new TestEnvironment ( ) ;
27
-
28
- var profileConditionProvider = new WorkerProfileConditionProvider ( new TestLogger < WorkerProfileConditionProvider > ( ) , _testEnvironment ) ;
29
- _profileManager = new WorkerProfileManager ( new TestLogger < WorkerProfileManager > ( ) , new [ ] { profileConditionProvider } ) ;
30
26
}
31
27
32
28
public void Dispose ( )
@@ -40,7 +36,7 @@ public void DefaultLanguageWorkersDir()
40
36
var expectedWorkersDir = Path . Combine ( Path . GetDirectoryName ( new Uri ( typeof ( RpcWorkerConfigFactory ) . Assembly . CodeBase ) . LocalPath ) , RpcWorkerConstants . DefaultWorkersDirectoryName ) ;
41
37
var config = new ConfigurationBuilder ( ) . Build ( ) ;
42
38
var testLogger = new TestLogger ( "test" ) ;
43
- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
39
+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
44
40
Assert . Equal ( expectedWorkersDir , configFactory . WorkersDirPath ) ;
45
41
}
46
42
@@ -73,7 +69,7 @@ public void LanguageWorker_WorkersDir_Set()
73
69
} )
74
70
. Build ( ) ;
75
71
var testLogger = new TestLogger ( "test" ) ;
76
- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
72
+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
77
73
Assert . Equal ( expectedWorkersDir , configFactory . WorkersDirPath ) ;
78
74
}
79
75
@@ -89,7 +85,7 @@ public void LanguageWorker_WorkersDir_NotSet()
89
85
var config = configBuilder . Build ( ) ;
90
86
var scriptSettingsManager = new ScriptSettingsManager ( config ) ;
91
87
var testLogger = new TestLogger ( "test" ) ;
92
- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
88
+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
93
89
Assert . Equal ( expectedWorkersDir , configFactory . WorkersDirPath ) ;
94
90
}
95
91
@@ -100,7 +96,7 @@ public void JavaPath_FromEnvVars()
100
96
var config = configBuilder . Build ( ) ;
101
97
var scriptSettingsManager = new ScriptSettingsManager ( config ) ;
102
98
var testLogger = new TestLogger ( "test" ) ;
103
- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
99
+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
104
100
var workerConfigs = configFactory . GetConfigs ( ) ;
105
101
var javaPath = workerConfigs . Where ( c => c . Description . Language . Equals ( "java" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) . Description . DefaultExecutablePath ;
106
102
Assert . DoesNotContain ( @"%JAVA_HOME%" , javaPath ) ;
@@ -121,7 +117,7 @@ public void DefaultWorkerConfigs_Overrides_DefaultWorkerRuntimeVersion_AppSettin
121
117
var testLogger = new TestLogger ( "test" ) ;
122
118
using ( var variables = new TestScopedSettings ( scriptSettingsManager , testEnvVariables ) )
123
119
{
124
- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
120
+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
125
121
var workerConfigs = configFactory . GetConfigs ( ) ;
126
122
var pythonWorkerConfig = workerConfigs . Where ( w => w . Description . Language . Equals ( "python" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) ;
127
123
var powershellWorkerConfig = workerConfigs . Where ( w => w . Description . Language . Equals ( "powershell" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) ;
@@ -143,7 +139,7 @@ public void DefaultWorkerConfigs_Overrides_VersionAppSetting()
143
139
var config = configBuilder . Build ( ) ;
144
140
var scriptSettingsManager = new ScriptSettingsManager ( config ) ;
145
141
var testLogger = new TestLogger ( "test" ) ;
146
- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , testEnvironment , new TestMetricsLogger ( ) ) ;
142
+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , testEnvironment , new TestMetricsLogger ( ) ) ;
147
143
var workerConfigs = configFactory . GetConfigs ( ) ;
148
144
var powershellWorkerConfig = workerConfigs . Where ( w => w . Description . Language . Equals ( "powershell" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) ;
149
145
Assert . Equal ( 1 , workerConfigs . Count ) ;
@@ -170,7 +166,7 @@ public void ShouldAddProvider_Returns_Expected(string workerLanguage, string wor
170
166
}
171
167
var config = new ConfigurationBuilder ( ) . Build ( ) ;
172
168
var testLogger = new TestLogger ( "test" ) ;
173
- RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
169
+ RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
174
170
_testEnvironment . SetEnvironmentVariable ( RpcWorkerConstants . FunctionWorkerRuntimeSettingName , workerRuntime ) ;
175
171
Assert . Equal ( expectedResult , rpcWorkerConfigFactory . ShouldAddWorkerConfig ( workerLanguage ) ) ;
176
172
}
@@ -200,7 +196,7 @@ public void GetWorkerProcessCount_Tests(bool defaultWorkerConfig, bool setProces
200
196
}
201
197
var config = new ConfigurationBuilder ( ) . Build ( ) ;
202
198
var testLogger = new TestLogger ( "test" ) ;
203
- RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
199
+ RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
204
200
var result = rpcWorkerConfigFactory . GetWorkerProcessCount ( workerConfig ) ;
205
201
if ( defaultWorkerConfig )
206
202
{
@@ -244,7 +240,7 @@ public void GetWorkerProcessCount_ThrowsException_Tests()
244
240
245
241
var config = new ConfigurationBuilder ( ) . Build ( ) ;
246
242
var testLogger = new TestLogger ( "test" ) ;
247
- RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
243
+ RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
248
244
var resultEx1 = Assert . Throws < ArgumentOutOfRangeException > ( ( ) => rpcWorkerConfigFactory . GetWorkerProcessCount ( workerConfig ) ) ;
249
245
Assert . Contains ( "ProcessCount must be greater than 0" , resultEx1 . Message ) ;
250
246
0 commit comments