From 0ca356abab47632fbc85edda8fd6af8b70332fb5 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 2 Jan 2013 17:37:38 +0000 Subject: [PATCH] heat tests : functional tests poll_glance cleanup There's no point passing self.glanceclient into poll_glance() when we can just reference it directly Change-Id: I8ee873f544f847ca9f203ad9da06244597cdff7a Signed-off-by: Steven Hardy --- heat/tests/functional/util.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py index f762fc0e..b87cd74f 100644 --- a/heat/tests/functional/util.py +++ b/heat/tests/functional/util.py @@ -484,7 +484,7 @@ class Stack(object): imagename = p_os + '-' + arch + '-' + type # skip creating jeos if image already available - if not self.poll_glance(self.glanceclient, imagename, False): + if not self.poll_glance(imagename, False): self.testcase.assertEqual(os.geteuid(), 0, 'No JEOS found - run as root to create') @@ -495,7 +495,7 @@ class Stack(object): # asynchronous. So poll glance until image is registered. self.poll_glance(self.glanceclient, imagename, True) - def poll_glance(self, gclient, imagename, block): + def poll_glance(self, imagename, block): image = None tries = 0 while image is None: @@ -504,7 +504,8 @@ class Stack(object): if block: time.sleep(15) print "Checking glance for image registration" - imageslist = gclient.images.list(filters={'name': imagename}) + imageslist = self.glanceclient.images.list( + filters={'name': imagename}) image = next(imageslist, None) if image: print "Found image registration for %s" % imagename -- 2.45.2