Merge pull request #512 from lmr/aexpect-fix-avocado-virt-bug

avocado.aexpect: Fix bugs that broke avocado-virt

avocado/aexpect.py

@@ -15,9 +15,12 @@ import tempfile
 import logging
 import shutil
 
-from avocado.utils import genio
-from avocado.utils import path as utils_path
-
+# ATTENTION: Do not import avocado libraries in this side of the aexpect
+# module. This side of the module will be executed stand alone and will not
+# have access to the avocado libraries. If you do that, the server won't
+# start, making the client to wait indefinitely for the server and creating
+# a deadlock. Import avocado libs if necessary below, where the other avocado
+# imports are defined.
 
 BASE_DIR = os.environ.get('TMPDIR', '/tmp')
 # If you want to debug problems with your aexpect instances, setting
@@ -277,7 +280,9 @@ except ImportError:
 from avocado.utils import astring
 from avocado.utils import data_factory
 from avocado.utils import process
+from avocado.utils import genio
 from avocado.utils import wait
+from avocado.utils import path as utils_path
 
 
 class ExpectError(Exception):