zuul/nodepool
Code Issues Proposed changes

Fix race in test_aws_resource_cleanup

Browse Source 
If the test was slow enough that the image was not immediately
deleted, we would fail the assertIsNone because image.state=='available'.

Correct this by continuing to iterate in the wait loop while that's
true.

Change-Id: I6ee14c5737abe37d90d6b57442644085b08f30ab
This commit is contained in:
James E. Blair 2022-06-30 15:23:15 -07:00
parent e668905f08
commit 025318b825
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodepool/tests/unit/test_driver_aws.py
View File

@ -498,7 +498,9 @@ class TestDriverAws(tests.DBTestCase):
image = self.ec2.Image(image_id)
try:
# If this has a value the image was not deleted
self.assertIsNone(image.state)
if image.state == 'available':
# Definitely not deleted yet
continue
except AttributeError:
# Per AWS API, a recently deleted image is empty and
# looking at the state raises an AttributeFailure; see