ia64/xen-unstable

changeset 9958:491f3f48704e

Move the logic to find the Xen Python scripts above the import statements.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@leeni.uk.xensource.com
date Sat May 06 15:42:12 2006 +0100 (2006-05-06)
parents 0afdf20b3efa
children bf56c745515f
files tools/xm-test/lib/XmTestLib/__init__.py
line diff
     1.1 --- a/tools/xm-test/lib/XmTestLib/__init__.py	Fri May 05 18:36:26 2006 +0100
     1.2 +++ b/tools/xm-test/lib/XmTestLib/__init__.py	Sat May 06 15:42:12 2006 +0100
     1.3 @@ -3,13 +3,8 @@
     1.4  # Author: Dan Smith <danms@us.ibm.com>
     1.5  #
     1.6  
     1.7 -from Console import *
     1.8 -from Test import *
     1.9 -from Xm import *
    1.10 -from XenDomain import *
    1.11 -from config import *
    1.12 -from XenDevice import *
    1.13 -from NetConfig import *
    1.14 +import os.path
    1.15 +import sys
    1.16  
    1.17  # Use the auxbin module in Xend to determine the correct Python path.  We
    1.18  # take the first installed instance of auxbin that we find, and then run it
    1.19 @@ -28,6 +23,14 @@ for p in ['python%s' % sys.version[:3], 
    1.20              sys.path.append(libpath)
    1.21              break
    1.22  
    1.23 +from Console import *
    1.24 +from Test import *
    1.25 +from Xm import *
    1.26 +from XenDomain import *
    1.27 +from config import *
    1.28 +from XenDevice import *
    1.29 +from NetConfig import *
    1.30 +
    1.31  # Give this test a clean slate
    1.32  destroyAllDomUs()
    1.33