diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 21:07:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 21:07:42 +0300 |
commit | 7b52c7cb634ef7047d30b0337fe477bcdcedf41d (patch) | |
tree | 374ca9e908204488422046f10e340d1500780362 /spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb | |
parent | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb')
-rw-r--r-- | spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb index 4ba5726732c..8b93ef86eba 100644 --- a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb +++ b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb @@ -124,28 +124,28 @@ describe Gitlab::SidekiqConfig::CliMethods do name: 'a', feature_category: :category_a, has_external_dependencies: false, - latency_sensitive: false, + urgency: :default, resource_boundary: :cpu }, { name: 'a:2', feature_category: :category_a, has_external_dependencies: false, - latency_sensitive: true, + urgency: :high, resource_boundary: :none }, { name: 'b', feature_category: :category_b, has_external_dependencies: true, - latency_sensitive: true, + urgency: :high, resource_boundary: :memory }, { name: 'c', feature_category: :category_c, has_external_dependencies: false, - latency_sensitive: false, + urgency: :none, resource_boundary: :memory } ] @@ -166,12 +166,12 @@ describe Gitlab::SidekiqConfig::CliMethods do 'has_external_dependencies=true|has_external_dependencies=false' | %w(a a:2 b c) 'has_external_dependencies!=true' | %w(a a:2 c) - # latency_sensitive - 'latency_sensitive=true' | %w(a:2 b) - 'latency_sensitive=false' | %w(a c) - 'latency_sensitive=true,false' | %w(a a:2 b c) - 'latency_sensitive=true|latency_sensitive=false' | %w(a a:2 b c) - 'latency_sensitive!=true' | %w(a c) + # urgency + 'urgency=high' | %w(a:2 b) + 'urgency=default' | %w(a) + 'urgency=high,default,none' | %w(a a:2 b c) + 'urgency=default|urgency=none' | %w(a c) + 'urgency!=high' | %w(a c) # name 'name=a' | %w(a) @@ -186,8 +186,8 @@ describe Gitlab::SidekiqConfig::CliMethods do 'resource_boundary!=memory,cpu' | %w(a:2) # combinations - 'feature_category=category_a&latency_sensitive=true' | %w(a:2) - 'feature_category=category_a&latency_sensitive=true|feature_category=category_c' | %w(a:2 c) + 'feature_category=category_a&urgency=high' | %w(a:2) + 'feature_category=category_a&urgency=high|feature_category=category_c' | %w(a:2 c) end with_them do |