saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't delete shutting down ec2 instances

Browse source
This commit is contained in:
Tyler Johnson 2019-08-22 12:22:27 -06:00
parent 36029428a7
commit 802235d003
No known key found for this signature in database
GPG key ID: 691E31397E27D004
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/cloud/helpers/cloud_test_base.py
View file

@ -210,7 +210,9 @@ class CloudTest(ShellCase):
'''
query = self.query_instances()
for q in query:
if q.startswith(self.instance_name) and not q == self.instance_name:
# Verify but this is a new name and not a shutting down ec2 instance
if q.startswith(self.instance_name) and not (q == self.instance_name) \
and not (q.split('-')[-1].startswith('DEL')):
return q
def _ensure_deletion(self, instance_name=None):