Skip to content

Commit b105ba8

Browse files
committed
[tests] Made selenium test resilient to failures
1 parent 3a52919 commit b105ba8

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

openwisp_firmware_upgrader/tests/base.py

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class TestUpgraderMixin(CreateConnectionsMixin):
2626
)
2727

2828
def tearDown(self):
29+
super().tearDown()
2930
for fw in FirmwareImage.objects.all():
3031
fw.delete()
3132

openwisp_firmware_upgrader/tests/test_selenium.py

+10
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def setUp(self):
5353
)
5454

5555
def tearDown(self):
56+
super().tearDown()
5657
# Accept unsaved changes alert to allow other tests to run
5758
try:
5859
self.web_driver.refresh()
@@ -275,6 +276,12 @@ def test_batch_upgrade_upgrade_options(self, *args):
275276
self.web_driver.find_element(
276277
by=By.CSS_SELECTOR, value='input[name="upgrade_all"]'
277278
).click()
279+
try:
280+
WebDriverWait(self.web_driver, 5).until(
281+
EC.url_contains('batchupgradeoperation')
282+
)
283+
except TimeoutException:
284+
self.fail('User was not redirected to Mass upgrade operations page')
278285
self.assertEqual(
279286
BatchUpgradeOperation.objects.filter(
280287
upgrade_options={
@@ -326,6 +333,9 @@ def test_upgrader_with_unsupported_upgrade_options(self, *args):
326333
)
327334
)
328335
)
336+
WebDriverWait(self.web_driver, 5).until(
337+
EC.visibility_of_element_located((By.ID, 'id_devicefirmware-0-image'))
338+
)
329339
image_select = Select(
330340
self.web_driver.find_element(
331341
by=By.ID, value='id_devicefirmware-0-image'

0 commit comments

Comments
 (0)