@@ -79,12 +79,15 @@ public async Task EndToEnd(CancellationToken ct)
79
79
finally
80
80
{
81
81
// In case something goes wrong, make sure to clean up.
82
- await credentialBackend . DeleteCredentials ( CancellationToken . None ) ;
82
+ using var cts = new CancellationTokenSource ( ) ;
83
+ cts . CancelAfter ( 15_000 ) ;
84
+ await credentialBackend . DeleteCredentials ( cts . Token ) ;
83
85
}
84
86
}
85
87
86
88
[ Test ( Description = "Test SetCredentials with invalid URL or token" ) ]
87
- public void SetCredentialsInvalidUrlOrToken ( )
89
+ [ CancelAfter ( 30_000 ) ]
90
+ public void SetCredentialsInvalidUrlOrToken ( CancellationToken ct )
88
91
{
89
92
var credentialBackend = new Mock < ICredentialBackend > ( MockBehavior . Strict ) ;
90
93
var apiClientFactory = new Mock < ICoderApiClientFactory > ( MockBehavior . Strict ) ;
@@ -107,13 +110,14 @@ public void SetCredentialsInvalidUrlOrToken()
107
110
foreach ( var ( url , token , expectedMessage ) in cases )
108
111
{
109
112
var ex = Assert . ThrowsAsync < ArgumentException > ( ( ) =>
110
- manager . SetCredentials ( url , token , CancellationToken . None ) ) ;
113
+ manager . SetCredentials ( url , token , ct ) ) ;
111
114
Assert . That ( ex . Message , Does . Contain ( expectedMessage ) ) ;
112
115
}
113
116
}
114
117
115
118
[ Test ( Description = "Invalid server buildinfo response" ) ]
116
- public void InvalidServerBuildInfoResponse ( )
119
+ [ CancelAfter ( 30_000 ) ]
120
+ public void InvalidServerBuildInfoResponse ( CancellationToken ct )
117
121
{
118
122
var credentialBackend = new Mock < ICredentialBackend > ( MockBehavior . Strict ) ;
119
123
var apiClient = new Mock < ICoderApiClient > ( MockBehavior . Strict ) ;
@@ -126,7 +130,7 @@ public void InvalidServerBuildInfoResponse()
126
130
// Attempt a set.
127
131
var manager = new CredentialManager ( credentialBackend . Object , apiClientFactory . Object ) ;
128
132
var ex = Assert . ThrowsAsync < InvalidOperationException > ( ( ) =>
129
- manager . SetCredentials ( TestServerUrl , TestApiToken , CancellationToken . None ) ) ;
133
+ manager . SetCredentials ( TestServerUrl , TestApiToken , ct ) ) ;
130
134
Assert . That ( ex . Message , Does . Contain ( "Could not connect to or verify Coder server" ) ) ;
131
135
132
136
// Attempt a load.
@@ -136,12 +140,13 @@ public void InvalidServerBuildInfoResponse()
136
140
CoderUrl = TestServerUrl ,
137
141
ApiToken = TestApiToken ,
138
142
} ) ;
139
- var cred = manager . LoadCredentials ( CancellationToken . None ) . Result ;
143
+ var cred = manager . LoadCredentials ( ct ) . Result ;
140
144
Assert . That ( cred . State , Is . EqualTo ( CredentialState . Invalid ) ) ;
141
145
}
142
146
143
147
[ Test ( Description = "Invalid server version" ) ]
144
- public void InvalidServerVersion ( )
148
+ [ CancelAfter ( 30_000 ) ]
149
+ public void InvalidServerVersion ( CancellationToken ct )
145
150
{
146
151
var credentialBackend = new Mock < ICredentialBackend > ( MockBehavior . Strict ) ;
147
152
var apiClient = new Mock < ICoderApiClient > ( MockBehavior . Strict ) ;
@@ -157,7 +162,7 @@ public void InvalidServerVersion()
157
162
// Attempt a set.
158
163
var manager = new CredentialManager ( credentialBackend . Object , apiClientFactory . Object ) ;
159
164
var ex = Assert . ThrowsAsync < ArgumentException > ( ( ) =>
160
- manager . SetCredentials ( TestServerUrl , TestApiToken , CancellationToken . None ) ) ;
165
+ manager . SetCredentials ( TestServerUrl , TestApiToken , ct ) ) ;
161
166
Assert . That ( ex . Message , Does . Contain ( "not within required server version range" ) ) ;
162
167
163
168
// Attempt a load.
@@ -167,12 +172,13 @@ public void InvalidServerVersion()
167
172
CoderUrl = TestServerUrl ,
168
173
ApiToken = TestApiToken ,
169
174
} ) ;
170
- var cred = manager . LoadCredentials ( CancellationToken . None ) . Result ;
175
+ var cred = manager . LoadCredentials ( ct ) . Result ;
171
176
Assert . That ( cred . State , Is . EqualTo ( CredentialState . Invalid ) ) ;
172
177
}
173
178
174
179
[ Test ( Description = "Invalid server user response" ) ]
175
- public void InvalidServerUserResponse ( )
180
+ [ CancelAfter ( 30_000 ) ]
181
+ public void InvalidServerUserResponse ( CancellationToken ct )
176
182
{
177
183
var credentialBackend = new Mock < ICredentialBackend > ( MockBehavior . Strict ) ;
178
184
var apiClient = new Mock < ICoderApiClient > ( MockBehavior . Strict ) ;
@@ -188,7 +194,7 @@ public void InvalidServerUserResponse()
188
194
// Attempt a set.
189
195
var manager = new CredentialManager ( credentialBackend . Object , apiClientFactory . Object ) ;
190
196
var ex = Assert . ThrowsAsync < InvalidOperationException > ( ( ) =>
191
- manager . SetCredentials ( TestServerUrl , TestApiToken , CancellationToken . None ) ) ;
197
+ manager . SetCredentials ( TestServerUrl , TestApiToken , ct ) ) ;
192
198
Assert . That ( ex . Message , Does . Contain ( "Could not connect to or verify Coder server" ) ) ;
193
199
194
200
// Attempt a load.
@@ -198,12 +204,13 @@ public void InvalidServerUserResponse()
198
204
CoderUrl = TestServerUrl ,
199
205
ApiToken = TestApiToken ,
200
206
} ) ;
201
- var cred = manager . LoadCredentials ( CancellationToken . None ) . Result ;
207
+ var cred = manager . LoadCredentials ( ct ) . Result ;
202
208
Assert . That ( cred . State , Is . EqualTo ( CredentialState . Invalid ) ) ;
203
209
}
204
210
205
211
[ Test ( Description = "Invalid username" ) ]
206
- public void InvalidUsername ( )
212
+ [ CancelAfter ( 30_000 ) ]
213
+ public void InvalidUsername ( CancellationToken ct )
207
214
{
208
215
var credentialBackend = new Mock < ICredentialBackend > ( MockBehavior . Strict ) ;
209
216
var apiClient = new Mock < ICoderApiClient > ( MockBehavior . Strict ) ;
@@ -219,7 +226,7 @@ public void InvalidUsername()
219
226
// Attempt a set.
220
227
var manager = new CredentialManager ( credentialBackend . Object , apiClientFactory . Object ) ;
221
228
var ex = Assert . ThrowsAsync < InvalidOperationException > ( ( ) =>
222
- manager . SetCredentials ( TestServerUrl , TestApiToken , CancellationToken . None ) ) ;
229
+ manager . SetCredentials ( TestServerUrl , TestApiToken , ct ) ) ;
223
230
Assert . That ( ex . Message , Does . Contain ( "username is empty" ) ) ;
224
231
225
232
// Attempt a load.
@@ -229,7 +236,7 @@ public void InvalidUsername()
229
236
CoderUrl = TestServerUrl ,
230
237
ApiToken = TestApiToken ,
231
238
} ) ;
232
- var cred = manager . LoadCredentials ( CancellationToken . None ) . Result ;
239
+ var cred = manager . LoadCredentials ( ct ) . Result ;
233
240
Assert . That ( cred . State , Is . EqualTo ( CredentialState . Invalid ) ) ;
234
241
}
235
242
0 commit comments