Skip to content

Commit ba32f85

Browse files
author
Vladyslav Yurchenko
committed
Smoke testing. Garbage ignorance. No resources conflicts.
1 parent ffda320 commit ba32f85

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tests/integration/ha_tests/test_smoke.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async def test_app_force_removal(ops_test: OpsTest, charm: str):
6363
)
6464

6565
logger.info("waiting for postgresql")
66-
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3)):
66+
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3), reraise=True):
6767
with attempt:
6868
assert await is_postgresql_ready(ops_test, primary_name)
6969

@@ -72,7 +72,7 @@ async def test_app_force_removal(ops_test: OpsTest, charm: str):
7272

7373
# Check if storage exists after application deployed
7474
logger.info("werifing is storage exists")
75-
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3)):
75+
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3), reraise=True):
7676
with attempt:
7777
assert await is_storage_exists(ops_test, storage_id_str)
7878

@@ -91,7 +91,7 @@ async def test_app_force_removal(ops_test: OpsTest, charm: str):
9191

9292
# Storage should remain
9393
logger.info("werifing is storage exists")
94-
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3)):
94+
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3), reraise=True):
9595
with attempt:
9696
assert await is_storage_exists(ops_test, storage_id_str)
9797

@@ -103,7 +103,7 @@ async def test_charm_garbage_ignorance(ops_test: OpsTest, charm: str):
103103
async with ops_test.fast_forward():
104104
logger.info("checking garbage storage")
105105
garbage_storage = None
106-
for attempt in Retrying(stop=stop_after_delay(30 * 3), wait=wait_fixed(3)):
106+
for attempt in Retrying(stop=stop_after_delay(30 * 3), wait=wait_fixed(3), reraise=True):
107107
with attempt:
108108
garbage_storage = await get_any_deatached_storage(ops_test)
109109

@@ -119,7 +119,7 @@ async def test_charm_garbage_ignorance(ops_test: OpsTest, charm: str):
119119
)
120120

121121
logger.info("waiting for postgresql")
122-
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3)):
122+
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3), reraise=True):
123123
with attempt:
124124
assert await is_postgresql_ready(ops_test, primary_name)
125125

@@ -130,7 +130,7 @@ async def test_charm_garbage_ignorance(ops_test: OpsTest, charm: str):
130130

131131
# Check if storage exists after application deployed
132132
logger.info("werifing is storage exists")
133-
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3)):
133+
for attempt in Retrying(stop=stop_after_delay(15 * 3), wait=wait_fixed(3), reraise=True):
134134
with attempt:
135135
assert await is_storage_exists(ops_test, storage_id_str)
136136

@@ -150,7 +150,7 @@ async def test_app_resources_conflicts_v3(ops_test: OpsTest, charm: str):
150150
async with ops_test.fast_forward():
151151
logger.info("checking garbage storage")
152152
garbage_storage = None
153-
for attempt in Retrying(stop=stop_after_delay(30 * 3), wait=wait_fixed(3)):
153+
for attempt in Retrying(stop=stop_after_delay(30 * 3), wait=wait_fixed(3), reraise=True):
154154
with attempt:
155155
garbage_storage = await get_any_deatached_storage(ops_test)
156156

@@ -190,7 +190,7 @@ async def test_app_resources_conflicts_v2(ops_test: OpsTest, charm: str):
190190
async with ops_test.fast_forward():
191191
logger.info("checking garbage storage")
192192
garbage_storage = None
193-
for attempt in Retrying(stop=stop_after_delay(30 * 3), wait=wait_fixed(3)):
193+
for attempt in Retrying(stop=stop_after_delay(30 * 3), wait=wait_fixed(3), reraise=True):
194194
with attempt:
195195
garbage_storage = await get_any_deatached_storage(ops_test)
196196

0 commit comments

Comments
 (0)