Fix timeouts in the JWT endpoint tests

This commit is contained in:
Joseph Schorr 2016-04-13 13:59:07 -04:00 committed by Jimmy Zelinskie
parent 522cf68c5d
commit bc08ac2749
3 changed files with 15 additions and 13 deletions

View file

@ -655,16 +655,16 @@ def populate_database(minimal=False, with_storage=False):
__generate_service_key('kid1', 'somesamplekey', new_user_1, today,
ServiceKeyApprovalType.SUPERUSER)
__generate_service_key('kid2', 'someexpiringkey', new_user_1, week_ago,
ServiceKeyApprovalType.SUPERUSER, today + timedelta(14))
ServiceKeyApprovalType.SUPERUSER, today + timedelta(days=14))
__generate_service_key('kid3', 'unapprovedkey', new_user_1, today, None)
__generate_service_key('kid4', 'autorotatingkey', new_user_1, six_ago,
ServiceKeyApprovalType.KEY_ROTATION, today + timedelta(1),
ServiceKeyApprovalType.KEY_ROTATION, today + timedelta(days=1),
rotation_duration=timedelta(hours=12).total_seconds())
__generate_service_key('kid5', 'key for another service', new_user_1, today,
ServiceKeyApprovalType.SUPERUSER, today + timedelta(14),
ServiceKeyApprovalType.SUPERUSER, today + timedelta(days=14),
service='different_sample_service')
model.log.log_action('org_create_team', org.username, performer=new_user_1,