Incorrect retry cause false positive in CNF tests

This is a clone of issue OCPBUGS-246. The following is the description of the original issue:
—
Description of problem:
incorrect code in test utilities fails to perform retry with correct data, leading to false positive. The test code is vendored in cnf-tests, so this is issue is visible outside CI

Version-Release number of selected component (if applicable):
up to 4.12 included

How reproducible:
randomly. It's a race, so it triggers randomly

Steps to Reproduce:
1. run the CNF tests suite a high enough number of times
2. check the failures
3.

Actual results:
Some failures are in retry loops which are supposed to prevent this kind of failures in the first place

Expected results:
The retry works as expected (uses up to date data, not original data)

Additional info: