vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2840 from coreos-inc/flaky-test-fix

Browse source 
Fix bug in service key rotation and fix associated flaky test
This commit is contained in:
josephschorr 2017-07-28 14:37:22 -04:00 committed by GitHub
commit 67f021c695
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
workers/servicekeyworker/servicekeyworker.py
View file

@ -20,7 +20,7 @@ class ServiceKeyWorker(Worker):
""" """
expiration = timedelta(minutes=instance_keys.service_key_expiration) expiration = timedelta(minutes=instance_keys.service_key_expiration)
logger.debug('Starting refresh of automatic service keys') logger.debug('Starting refresh of automatic service keys')
model.set_key_expiration(instance_keys.local_key_id, datetime.now() + expiration) model.set_key_expiration(instance_keys.local_key_id, datetime.utcnow() + expiration)
logger.debug('Finished refresh of automatic service keys') logger.debug('Finished refresh of automatic service keys')

3
workers/servicekeyworker/test/test_servicekeyworker.py
View file

@ -10,8 +10,9 @@ from workers.servicekeyworker.models_pre_oci import pre_oci_model as model
def test_refresh_service_key(initialized_db): def test_refresh_service_key(initialized_db):
# Create a service key for testing. # Create a service key for testing.
original_expiration = datetime.now() + timedelta(minutes=10) original_expiration = datetime.utcnow() + timedelta(minutes=10)
test_key_kid = model.create_service_key_for_testing(original_expiration) test_key_kid = model.create_service_key_for_testing(original_expiration)
assert model.get_service_key_expiration(test_key_kid)
instance_keys = AttrDict(dict(local_key_id=test_key_kid, service_key_expiration=30)) instance_keys = AttrDict(dict(local_key_id=test_key_kid, service_key_expiration=30))
with patch('workers.servicekeyworker.servicekeyworker.instance_keys', instance_keys): with patch('workers.servicekeyworker.servicekeyworker.instance_keys', instance_keys):