diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-31 13:37:21 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-31 13:37:21 +0200 |
commit | 91761b06851832be643258f390ea7593beacae16 (patch) | |
tree | e4b7819dd34b3dd5090342f0dfdf263dea20cf10 /app/services | |
parent | 2fdae52fd1048779a84770b39fe2961f31b1bd79 (diff) | |
download | gitlab-ce-91761b06851832be643258f390ea7593beacae16.tar.gz |
Add tests.
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/archive_repository_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/archive_repository_service.rb b/app/services/archive_repository_service.rb index 40b0a64fb73..e1b41527d8d 100644 --- a/app/services/archive_repository_service.rb +++ b/app/services/archive_repository_service.rb @@ -6,7 +6,7 @@ class ArchiveRepositoryService @project, @ref, @format = project, ref, format.downcase end - def execute + def execute(options = {}) project.repository.clean_old_archives raise "No archive file path" unless file_path @@ -17,7 +17,7 @@ class ArchiveRepositoryService RepositoryArchiveWorker.perform_async(project.id, ref, format) end - archived = wait_until_archived + archived = wait_until_archived(options[:timeout] || 5.0) file_path if archived end @@ -45,6 +45,8 @@ class ArchiveRepositoryService end def wait_until_archived(timeout = 5.0) + return archived? if timeout == 0.0 + t1 = Time.now begin |