tests/unit/test-blockjob: Re-enable complete_in_standby test
PATCH v2 1/1 tests/unit/test-blockjob: Re-enable complete_in_standby test
Pause the job while draining so that pause_count will be increased and bdrv_drain_all_end() won't reset it to 0, so the job will not continue.
With this fix, the test is not flaky anymore.
Additionally remove useless aiocontext lock around bdrv_drain_all_end() in test_complete_in_standby().
Fixes b6903cbe3a2 "tests/unit/test-blockjob: Disable
complete_in_standby test"
Suggested-by Hanna Czenczek <[email protected]>
Signed-off-by Emanuele Giuseppe Esposito <[email protected]>
--- tests/unit/test-blockjob.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
tests/unit/test-blockjob.c +7 -11
@@ -488,11 +488,14 @@ static void test_complete_in_standby(void)bdrv_drain_all_begin ();assert_job_status_is (job,JOB_STATUS_STANDBY ); -/* Lock the IO thread to prevent the job from being run */ -aio_context_acquire (ctx); +/* +* Increase pause_count so that the counter is +* unbalanced and job won't resume +*/ +job_pause (job); +/* This will schedule the job to resume it */ bdrv_drain_all_end (); -aio_context_release (ctx); WITH_JOB_LOCK_GUARD() {/* But the job cannot run, so it will remain on standby */
@@ -531,13 +534,6 @@ int main(int argc, char **argv)g_test_add_func ("/blockjob/cancel/standby" , test_cancel_standby);g_test_add_func ("/blockjob/cancel/pending" , test_cancel_pending);g_test_add_func ("/blockjob/cancel/concluded" , test_cancel_concluded); - -/* -* This test is flaky and sometimes fails in CI and otherwise: -* don't run unless user opts in via environment variable. -*/ -if (getenv ("QEMU_TEST_FLAKY_TESTS" )) { -g_test_add_func ("/blockjob/complete_in_standby" , test_complete_in_standby); - } +g_test_add_func ("/blockjob/complete_in_standby" , test_complete_in_standby);return g_test_run (); }
Signature · 1 line
2.39.1
Quoted 6 lines · Emanuele Giuseppe Esposito
Pause the job while draining so that
pause_countwill be increased andbdrv_drain_all_end()won't reset it to 0, so the job will not continue.With this fix, the test is not flaky anymore.
Quoted 7 lines
Additionally remove useless aiocontext lock around
bdrv_drain_all_end()intest_complete_in_standby().Fixes b6903cbe3a2 "tests/unit/test-blockjob: Disable
complete_in_standbytest"Suggested-by Hanna Czenczek<[email protected]>Signed-off-by Emanuele Giuseppe Esposito<[email protected]>
Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>
Signature · 2 lines
Best regards, Vladimir