Skip to content

Commit b3dfd9d

Browse files
committed
Readonly handling
* Change test for image existance in cleanup. * Make sure AwsManaged.async_ready always runs find.
1 parent 404d362 commit b3dfd9d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

carthage_aws/connection.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,17 @@ async def find(self):
363363
self.id = resource_id
364364
await run_in_executor(self.find_from_id)
365365
if self.mob:
366-
return
366+
return self.mob
367367
self.id = None
368368

369+
async def async_ready(self):
370+
'''Always run find, even for readonly objects.
371+
'''
372+
res = await super().async_ready()
373+
if self.readonly:
374+
await self.find()
375+
return res
376+
369377
async def possible_ids_for_name(self):
370378
resource_type = self.resource_type
371379
try:

tests/conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ async def cleanup(ainjector):
3636
try:
3737
while True:
3838
aws_image = await ainjector(AwsImage, name='test-ami*')
39+
if not aws_image.mob:
40+
break
3941
await aws_image.delete()
4042
except (LookupError, NotImplementedError):
4143
pass

0 commit comments

Comments
 (0)