diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-30 12:43:26 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-30 12:43:26 +0000 |
| commit | bbcdad188cdfbfda1c11b46ee1858e04496dd47f (patch) | |
| tree | 085097fcccea0f11cc35b6aaf49a25a7efc4bd1d /spec | |
| parent | bdd595c40de4ff9adc79bed54b1dca46ca4491fc (diff) | |
| parent | a23ef89e576125740bd33aa64e434c38454790fc (diff) | |
| download | gitlab-ce-bbcdad188cdfbfda1c11b46ee1858e04496dd47f.tar.gz | |
Merge branch '46917-gitlab-is-not-sending-objectstore-timeout-value-to-workhorse' into 'master'
Resolve "gitlab is not sending ObjectStore timeout value to workhorse"
Closes #46917
See merge request gitlab-org/gitlab-ce!19201
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/uploaders/object_storage_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index 4165a005063..2dd0925a8e6 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -382,6 +382,8 @@ describe ObjectStorage do is_expected.to have_key(:RemoteObject) expect(subject[:RemoteObject]).to have_key(:ID) + expect(subject[:RemoteObject]).to include(Timeout: a_kind_of(Integer)) + expect(subject[:RemoteObject][:Timeout]).to be(ObjectStorage::DIRECT_UPLOAD_TIMEOUT) expect(subject[:RemoteObject]).to have_key(:GetURL) expect(subject[:RemoteObject]).to have_key(:DeleteURL) expect(subject[:RemoteObject]).to have_key(:StoreURL) |