after rb#11848[Bug #21508537] fix is pushed.

Problem :
---------
The tests is are not waiting long enough
for the other thread to come to wait state.

high_prio_trx_6.test
high_prio_trx_7.test

Solution :
----------
Currently there seems to be no state that confirms the a thread
has reached lock waiting state. Checked other deadlock tests and
found it waits till the state reaches 'updating' state. The lock
wait happens immediately after this stage.

1. For update and delete wait till the state reaches 'updating'
2. wait for another 1 second to ensure that the thread

Reviewed-by: Sunny Bains <sunny.bains@oracle.com>

RB: 12572