alihan/buildbot
1
0
Fork 0
mirror of https://github.com/buildbot/buildbot.git synced 2021-05-20 10:47:20 +03:00
Code Issues Projects Releases Wiki Activity

ec2: Actually test spot instances endpoints in spot_* tests

Browse Source
This commit is contained in:
Povilas Kanapickas
2021-05-13 20:42:49 +03:00
parent d254aa6964
commit 613a48a28f
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/code_spelling_ignore_words.txt
View File

@@ -1275,6 +1275,7 @@ setupsite
setupsourcestep
setupstep
setuptools
sg
sha
shellcommand
shlex

52
master/buildbot/test/unit/worker/test_ec2.py
View File

@@ -27,9 +27,11 @@ try:
assert mock_ec2
import boto3
assert boto3
from botocore.client import ClientError
except ImportError:
boto3 = None
ec2 = None
ClientError = None
if boto3 is not None:
@@ -91,6 +93,40 @@ class TestEC2LatentWorker(unittest.TestCase):
c.terminate_instances(InstanceIds=[instance.id])
return c, r
def _patch_moto_describe_spot_price_history(self, bs, instance_type, price):
def fake_describe_price(*args, **kwargs):
return {
'SpotPriceHistory': [{'InstanceType': instance_type, 'SpotPrice': price}]
}
self.patch(bs.ec2.meta.client, "describe_spot_price_history", fake_describe_price)
def _patch_moto_describe_spot_instance_requests(self, c, r, bs):
this_call = [0]
orig_describe_instance = bs.ec2.meta.client.describe_spot_instance_requests
def fake_describe_spot_instance_requests(*args, **kwargs):
curr_call = this_call[0]
this_call[0] += 1
if curr_call == 0:
raise ClientError({'Error': {'Code': 'InvalidSpotInstanceRequestID.NotFound'}},
'DescribeSpotInstanceRequests')
if curr_call == 1:
return orig_describe_instance(*args, **kwargs)
response = orig_describe_instance(*args, **kwargs)
instances = r.instances.filter(Filters=[{'Name': 'instance-state-name',
'Values': ['running']}])
response['SpotInstanceRequests'][0]['Status']['Code'] = 'fulfilled'
response['SpotInstanceRequests'][0]['InstanceId'] = list(instances)[0].id
return response
self.patch(bs.ec2.meta.client, 'describe_spot_instance_requests',
fake_describe_spot_instance_requests)
@mock_ec2
def test_constructor_minimal(self):
c, r = self.botoSetup('latent_buildbot_slave')
@@ -350,7 +386,11 @@ class TestEC2LatentWorker(unittest.TestCase):
subnet_id=subnet.id,
)
bs._poll_resolution = 0
instance_id, _, _ = bs._start_instance()
self._patch_moto_describe_spot_price_history(bs, 'm1.large', price=1.0)
self._patch_moto_describe_spot_instance_requests(c, r, bs)
instance_id, _, _ = bs._request_spot_instance()
instances = r.instances.filter(
Filters=[{'Name': 'instance-state-name', 'Values': ['running']}])
instances = list(instances)
@@ -360,7 +400,9 @@ class TestEC2LatentWorker(unittest.TestCase):
self.assertEqual(instances[0].id, instance_id)
self.assertEqual(instances[0].subnet_id, subnet.id)
self.assertEqual(len(instances[0].security_groups), 1)
self.assertEqual(instances[0].security_groups[0]['GroupId'], sg.id)
# TODO: As of moto 2.0.2 GroupId is not handled in spot requests
# self.assertEqual(instances[0].security_groups[0]['GroupId'], sg.id)
@mock_ec2
def test_start_spot_instance(self):
@@ -377,7 +419,11 @@ class TestEC2LatentWorker(unittest.TestCase):
product_description=product_description
)
bs._poll_resolution = 0
instance_id, _, _ = bs._start_instance()
self._patch_moto_describe_spot_price_history(bs, 'm1.large', price=1.0)
self._patch_moto_describe_spot_instance_requests(c, r, bs)
instance_id, _, _ = bs._request_spot_instance()
instances = r.instances.filter(
Filters=[{'Name': 'instance-state-name', 'Values': ['running']}])
instances = list(instances)