From 1027aa871cf478a54d77088199da8caabacbe3a0 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 28 Mar 2006 14:41:04 +0000 Subject: * python/libvir.c: call the initialize entry point * src/libvirt_sym.version: add initialize entry point * src/libvirt.c: make sure we always initialize the lib * python/tests/*.py: start updating exemple for exception handling as pointed by Jim Meyering Daniel --- tests/basic.py | 5 +++-- tests/create.py | 9 ++++++++- tests/uuid.py | 10 ++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/basic.py b/tests/basic.py index b6f8831..c6dec81 100755 --- a/tests/basic.py +++ b/tests/basic.py @@ -14,8 +14,9 @@ if conn == None: # print conn -dom0 = conn.lookupByName("Domain-0") -if dom0 == None: +try: + dom0 = conn.lookupByName("Domain-0") +except: print 'Failed to find the main domain' sys.exit(1) diff --git a/tests/create.py b/tests/create.py index c897741..b717db1 100755 --- a/tests/create.py +++ b/tests/create.py @@ -115,13 +115,20 @@ time.sleep(10) print "shutdown of test domain" if dom.shutdown() != 0: + okay = 0 print 'Failed to shutdown domain test' i = 0 while i < 30: time.sleep(1) i = i + 1 - t = dom.info()[4] + try: + t = dom.info()[4] + except: + okay = 0 + t = -1 + break; + if t == 0: break diff --git a/tests/uuid.py b/tests/uuid.py index d71d420..605b759 100755 --- a/tests/uuid.py +++ b/tests/uuid.py @@ -19,16 +19,18 @@ if ids == None or len(ids) == 0: id = ids[-1] -dom = conn.lookupByID(id) -if dom == None: +try: + dom = conn.lookupByID(id) +except: print 'Failed to find the domain %d' sys.exit(1) name0 = dom.name() uuid = dom.UUID() print "Using domain %s" % (name0) -dom2 = conn.lookupByUUID(uuid) -if dom2 == None: +try: + dom2 = conn.lookupByUUID(uuid) +except: print 'Failed to lookup domain %d based on its UUID' sys.exit(1) if dom2.name() != name0: -- cgit