Merge pull request #911 from XueqiangWei/floppy_test-import_aecpect

for "aexpect", make it work under both autotest-framework and avocado-framework

qemu/tests/floppy.py

@@ -4,7 +4,10 @@ import os
 import sys
 import re
 
-import aexpect
+try:
+    import aexpect
+except ImportError:
+    from virttest import aexpect
 
 from autotest.client import utils
 from autotest.client.shared import error