From 138881dab84e3505dd267583ae5cebd23d88e865 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 29 Jun 2017 09:40:39 +0300 Subject: [PATCH] yapf format --- workers/gc/gcworker.py | 2 ++ workers/gc/models_interface.py | 2 ++ workers/gc/models_pre_oci.py | 6 ++++-- workers/gc/test/test_gcworker.py | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/workers/gc/gcworker.py b/workers/gc/gcworker.py index 5cf434eba..0fc769a13 100644 --- a/workers/gc/gcworker.py +++ b/workers/gc/gcworker.py @@ -3,6 +3,7 @@ from data.database import UseThenDisconnect from workers.gc.models_pre_oci import pre_oci_model as model from workers.worker import Worker + class GarbageCollectionWorker(Worker): def __init__(self): super(GarbageCollectionWorker, self).__init__() @@ -14,6 +15,7 @@ class GarbageCollectionWorker(Worker): with UseThenDisconnect(app.config): model.perform_garbage_collection() + if __name__ == "__main__": worker = GarbageCollectionWorker() worker.start() diff --git a/workers/gc/models_interface.py b/workers/gc/models_interface.py index 073447653..561d1ae0d 100644 --- a/workers/gc/models_interface.py +++ b/workers/gc/models_interface.py @@ -2,11 +2,13 @@ from abc import ABCMeta, abstractmethod from six import add_metaclass + @add_metaclass(ABCMeta) class GCWorkerDataInterface(object): """ Interface that represents all data store interactions required by the GC worker. """ + @abstractmethod def perform_garbage_collection(self): """ Performs garbage collection on a single repository, if any can be found with garbage. """ diff --git a/workers/gc/models_pre_oci.py b/workers/gc/models_pre_oci.py index bb1fda906..e672007e0 100644 --- a/workers/gc/models_pre_oci.py +++ b/workers/gc/models_pre_oci.py @@ -1,12 +1,13 @@ import logging -from data.model.repository import (find_repository_with_garbage, garbage_collect_repo, - get_random_gc_policy) +from data.model.repository import ( + find_repository_with_garbage, garbage_collect_repo, get_random_gc_policy) from workers.gc.models_interface import GCWorkerDataInterface logger = logging.getLogger(__name__) + class PreOCIModel(GCWorkerDataInterface): def perform_garbage_collection(self): repository = find_repository_with_garbage(get_random_gc_policy()) @@ -18,4 +19,5 @@ class PreOCIModel(GCWorkerDataInterface): garbage_collect_repo(repository) logger.debug('Finished GC of repository #%s (%s)', repository.id, repository.name) + pre_oci_model = PreOCIModel() diff --git a/workers/gc/test/test_gcworker.py b/workers/gc/test/test_gcworker.py index c301fc4b9..a153cf460 100644 --- a/workers/gc/test/test_gcworker.py +++ b/workers/gc/test/test_gcworker.py @@ -2,6 +2,7 @@ from workers.gc.gcworker import GarbageCollectionWorker from test.fixtures import * + def test_gc(initialized_db): worker = GarbageCollectionWorker() worker._garbage_collection_repos()