| Index: appengine/machine_provider/handlers_endpoints_test.py
|
| diff --git a/appengine/machine_provider/handlers_endpoints_test.py b/appengine/machine_provider/handlers_endpoints_test.py
|
| index 5378ebfbcceaca98dc371406b04ad110324cefdf..d066e42cffb93ea28e518a235719ba4b725a976d 100755
|
| --- a/appengine/machine_provider/handlers_endpoints_test.py
|
| +++ b/appengine/machine_provider/handlers_endpoints_test.py
|
| @@ -854,6 +854,27 @@ class MachineProviderLeaseTest(test_case.EndpointsTestCase):
|
| rpc_messages.LeaseRequestError.NONPOSITIVE_DEADLINE,
|
| )
|
|
|
| + def test_lease_duration_too_long(self):
|
| + def is_group_member(group):
|
| + return group == 'machine-provider-users'
|
| + self.mock(acl.auth, 'is_group_member', is_group_member)
|
| + lease_request = rpc_to_json(rpc_messages.LeaseRequest(
|
| + dimensions=rpc_messages.Dimensions(
|
| + os_family=rpc_messages.OSFamily.LINUX,
|
| + ),
|
| + duration=9999999999,
|
| + request_id='abc',
|
| + ))
|
| +
|
| + lease_response = jsonish_dict_to_rpc(
|
| + self.call_api('lease', lease_request).json,
|
| + rpc_messages.LeaseResponse,
|
| + )
|
| + self.assertEqual(
|
| + lease_response.error,
|
| + rpc_messages.LeaseRequestError.LEASE_TOO_LONG,
|
| + )
|
| +
|
| def test_lease_duration_and_lease_expiration_ts(self):
|
| def is_group_member(group):
|
| return group == 'machine-provider-users'
|
| @@ -863,7 +884,7 @@ class MachineProviderLeaseTest(test_case.EndpointsTestCase):
|
| os_family=rpc_messages.OSFamily.LINUX,
|
| ),
|
| duration=1,
|
| - lease_expiration_ts=9999999999,
|
| + lease_expiration_ts=int(utils.time_time()) + 3600,
|
| request_id='abc',
|
| ))
|
|
|
| @@ -884,7 +905,7 @@ class MachineProviderLeaseTest(test_case.EndpointsTestCase):
|
| dimensions=rpc_messages.Dimensions(
|
| os_family=rpc_messages.OSFamily.LINUX,
|
| ),
|
| - lease_expiration_ts=9999999999,
|
| + lease_expiration_ts=int(utils.time_time()) + 3600,
|
| request_id='abc',
|
| ))
|
|
|
| @@ -915,6 +936,27 @@ class MachineProviderLeaseTest(test_case.EndpointsTestCase):
|
| rpc_messages.LeaseRequestError.LEASE_EXPIRATION_TS_ERROR,
|
| )
|
|
|
| + def test_lease_timestamp_too_far(self):
|
| + def is_group_member(group):
|
| + return group == 'machine-provider-users'
|
| + self.mock(acl.auth, 'is_group_member', is_group_member)
|
| + lease_request = rpc_to_json(rpc_messages.LeaseRequest(
|
| + dimensions=rpc_messages.Dimensions(
|
| + os_family=rpc_messages.OSFamily.LINUX,
|
| + ),
|
| + lease_expiration_ts=9999999999,
|
| + request_id='abc',
|
| + ))
|
| +
|
| + lease_response = jsonish_dict_to_rpc(
|
| + self.call_api('lease', lease_request).json,
|
| + rpc_messages.LeaseResponse,
|
| + )
|
| + self.assertEqual(
|
| + lease_response.error,
|
| + rpc_messages.LeaseRequestError.LEASE_TOO_LONG,
|
| + )
|
| +
|
| def test_duplicate(self):
|
| def is_group_member(group):
|
| return group == 'machine-provider-users'
|
|
|