diff options
author | Stan Hu <stanhu@gmail.com> | 2016-07-14 20:55:33 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-07-14 20:55:33 -0700 |
commit | 3fd304c1a5063ad9fd53b851de79322f49c68997 (patch) | |
tree | bb7d8af9eac5fd765a355826c9022aa617eed053 | |
parent | f700f3ec5d524afd1575a27da76b39b08947b7ea (diff) | |
download | gitlab-ce-3fd304c1a5063ad9fd53b851de79322f49c68997.tar.gz |
Fix spec Don't attempt to disable statement timeout on a MySQL DBdisable-statement-timeout
-rw-r--r-- | spec/lib/gitlab/database/migration_helpers_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb index 9096ad101b0..4ec3f19e03f 100644 --- a/spec/lib/gitlab/database/migration_helpers_spec.rb +++ b/spec/lib/gitlab/database/migration_helpers_spec.rb @@ -13,6 +13,10 @@ describe Gitlab::Database::MigrationHelpers, lib: true do context 'outside a transaction' do before do expect(model).to receive(:transaction_open?).and_return(false) + + unless Gitlab::Database.postgresql? + allow_any_instance_of(Gitlab::Database::MigrationHelpers).to receive(:disable_statement_timeout) + end end context 'using PostgreSQL' do |