Merge remote-tracking branch 'ldoktor/test-timeout-did-not-finish'

Signed-off-by: NCaio Carrara <ccarrara@redhat.com>

avocado/core/runner.py

@@ -17,7 +17,6 @@
 Test runner module.
 """
 
-import multiprocessing
 import multiprocessing.queues
 import os
 import signal
@@ -469,7 +468,7 @@ class TestRunner(object):
 
         # Get/update the test status (decrease timeout on abort)
         if abort_reason:
-            finish_deadline = TIMEOUT_TEST_INTERRUPTED
+            finish_deadline = TIMEOUT_TEST_INTERRUPTED + time.time()
         else:
             finish_deadline = deadline
         test_state = test_status.finish(proc, time_started, step,