@@ -157,6 +157,8 @@ def starter_run_impl(self):
157
157
def finish_setup_impl (self ):
158
158
logging .info ("instances are ready, detecting leader" )
159
159
self ._detect_leader ()
160
+ if self .selenium :
161
+ self .set_selenium_instances ()
160
162
161
163
# add data to leader
162
164
self .makedata_instances .append (self .leader )
@@ -206,6 +208,9 @@ def test_setup_impl(self):
206
208
)
207
209
if not ret [0 ]:
208
210
raise Exception ("check data failed " + ret [1 ])
211
+ if self .selenium :
212
+ self .set_selenium_instances ()
213
+ self .selenium .test_setup ()
209
214
210
215
def wait_for_restore_impl (self , backup_starter ):
211
216
backup_starter .wait_for_restore ()
@@ -244,8 +249,7 @@ def upgrade_arangod_version_impl(self):
244
249
node .detect_instance_pids ()
245
250
self .print_all_instances_table ()
246
251
if self .selenium :
247
- self .selenium .web .refresh () # version doesn't upgrade if we don't do this...
248
- self .selenium .check_old (self .new_cfg , expect_follower_count = 2 , retry_count = 10 )
252
+ self .selenium .test_wait_for_upgrade ()
249
253
250
254
def upgrade_arangod_version_manual_impl (self ):
251
255
"""manual upgrade this installation"""
@@ -264,12 +268,7 @@ def upgrade_arangod_version_manual_impl(self):
264
268
[
265
269
InstanceType .RESILIENT_SINGLE ,
266
270
],
267
- [
268
- "--database.auto-upgrade" ,
269
- "true" ,
270
- "--javascript.copy-installation" ,
271
- "true" ,
272
- ],
271
+ ["--database.auto-upgrade" , "true" , "--javascript.copy-installation" , "true" ],
273
272
)
274
273
self .progress (True , "step 3 - launch instances again" )
275
274
for node in self .starter_instances :
@@ -282,8 +281,7 @@ def upgrade_arangod_version_manual_impl(self):
282
281
self .leader .maintainance (False , InstanceType .RESILIENT_SINGLE )
283
282
self .print_all_instances_table ()
284
283
if self .selenium :
285
- self .selenium .web .refresh () # version doesn't upgrade if we don't do this...
286
- self .selenium .check_old (self .new_cfg , expect_follower_count = 2 , retry_count = 10 )
284
+ self .selenium .test_wait_for_upgrade ()
287
285
288
286
def jam_attempt_impl (self ):
289
287
# pylint: disable=R0915
@@ -332,13 +330,9 @@ def jam_attempt_impl(self):
332
330
self .set_frontend_instances ()
333
331
334
332
if self .selenium :
335
- self .selenium .connect_server (
336
- self .leader .get_frontends (),
337
- "_system" ,
338
- self .new_cfg if self .new_cfg else self .cfg ,
339
- )
340
- cfg = self .new_cfg if self .new_cfg else self .cfg
341
- self .selenium .check_old (cfg = cfg , expect_follower_count = 1 , retry_count = 10 )
333
+ # cfg = self.new_cfg if self.new_cfg else self.cfg
334
+ self .set_selenium_instances ()
335
+ self .selenium .test_jam_attempt ()
342
336
343
337
prompt_user (
344
338
self .basecfg ,
@@ -370,8 +364,9 @@ def jam_attempt_impl(self):
370
364
371
365
logging .info ("state of this test is: %s" , "Success" if self .success else "Failed" )
372
366
if self .selenium :
373
- cfg = self .new_cfg if self .new_cfg else self .cfg
374
- self .selenium .check_old (cfg = cfg , expect_follower_count = 2 , retry_count = 10 )
367
+ # cfg = self.new_cfg if self.new_cfg else self.cfg
368
+ self .set_selenium_instances ()
369
+ self .selenium .test_wait_for_upgrade ()
375
370
376
371
def shutdown_impl (self ):
377
372
for node in self .starter_instances :
@@ -387,3 +382,13 @@ def before_backup_impl(self):
387
382
388
383
def after_backup_impl (self ):
389
384
pass
385
+
386
+ def set_selenium_instances (self ):
387
+ """set instances in selenium runner"""
388
+ self .selenium .set_instances (
389
+ self .cfg ,
390
+ self .leader .arango_importer ,
391
+ self .leader .arango_restore ,
392
+ [x for x in self .leader .all_instances if x .instance_type == InstanceType .RESILIENT_SINGLE ][0 ],
393
+ self .new_cfg ,
394
+ )
0 commit comments