diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-05 12:34:05 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-05 12:34:05 +0300 |
commit | 3cc5e48668caf97588241001866fd42666b2f8f0 (patch) | |
tree | 03cf2c22213686fad5829b896f515ebe9beeef3c /db/fixtures/development | |
parent | 3b39cf4e0c5d0ca680a40bb7232fee4f7fdfb02e (diff) | |
parent | 103b5bf60ba952e661b3e22d866cc64eed7358ee (diff) |
Merge branch 'sidekiq-transaction' into 'master'
Forbid Sidekiq scheduling in transactions
Closes #27233
See merge request !9376
Diffstat (limited to 'db/fixtures/development')
-rw-r--r-- | db/fixtures/development/11_keys.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/db/fixtures/development/11_keys.rb b/db/fixtures/development/11_keys.rb index 51e22137d6f..c405ecfdaf3 100644 --- a/db/fixtures/development/11_keys.rb +++ b/db/fixtures/development/11_keys.rb @@ -1,17 +1,26 @@ require './spec/support/sidekiq' + # Creating keys runs a gitlab-shell worker. Since we may not have the right # gitlab-shell path set (yet) we need to disable this for these fixtures. Sidekiq::Testing.disable! do Gitlab::Seeder.quiet do + # We want to run `add_to_shell` immediately instead of after the commit, so + # that it falls under `Sidekiq::Testing.disable!`. + Key.skip_callback(:commit, :after, :add_to_shell) + User.first(10).each do |user| key = "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt#{user.id + 100}6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=" - user.keys.create( + key = user.keys.create( title: "Sample key #{user.id}", key: key ) + Sidekiq::Worker.skipping_transaction_check do + key.add_to_shell + end + print '.' end end |