diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-13 10:33:14 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-13 10:33:14 +0000 |
commit | 4e846c735f8ec7e24e61454b0506b839a8f0ff3f (patch) | |
tree | 4504750e49a6a7f5b4c1f6efd22ccc0ee6c7a1e6 /spec/lib/gitlab | |
parent | 754d1ec4c03c206376178e17af3f5d78a1e16a08 (diff) | |
parent | 957ae8734b6babc481e8f186de848ba1fe914c0e (diff) | |
download | gitlab-ce-4e846c735f8ec7e24e61454b0506b839a8f0ff3f.tar.gz |
Merge branch 'sh-no-cache-populate-migration' into 'master'
Disable caching of tables for migration spec that drops a temporary table
See merge request gitlab-org/gitlab-ce!16965
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb index 8590522f3ef..fb3f29ff4c9 100644 --- a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb +++ b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb @@ -1,6 +1,11 @@ require 'spec_helper' -describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :sidekiq do +# This migration is using UploadService, which sets uploads.secret that is only +# added to the DB schema in 20180129193323. Since the test isn't isolated, we +# just use the latest schema when testing this migration. +# Ideally, the test should not use factories nor UploadService, and rely on the +# `table` helper instead. +describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :sidekiq, :migration, schema: 20180129193323 do include TrackUntrackedUploadsHelpers subject { described_class.new } |