diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 21:09:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 21:09:02 +0300 |
commit | 951616a26a61e880860ad862c1d45a8e3762b4bc (patch) | |
tree | ed6fe722e955aff38e13ca02d2aa7fdd4239c863 /spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb | |
parent | e06d0e779673d745972863302858105aad9032e5 (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 | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb index e6d0055df64..4ba5726732c 100644 --- a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb +++ b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb @@ -128,7 +128,7 @@ describe Gitlab::SidekiqConfig::CliMethods do resource_boundary: :cpu }, { - name: 'a_2', + name: 'a:2', feature_category: :category_a, has_external_dependencies: false, latency_sensitive: true, @@ -154,40 +154,40 @@ describe Gitlab::SidekiqConfig::CliMethods do context 'with valid input' do where(:query, :selected_queues) do # feature_category - 'feature_category=category_a' | %w(a a_2) - 'feature_category=category_a,category_c' | %w(a a_2 c) - 'feature_category=category_a|feature_category=category_c' | %w(a a_2 c) + 'feature_category=category_a' | %w(a a:2) + 'feature_category=category_a,category_c' | %w(a a:2 c) + 'feature_category=category_a|feature_category=category_c' | %w(a a:2 c) 'feature_category!=category_a' | %w(b c) # has_external_dependencies 'has_external_dependencies=true' | %w(b) - 'has_external_dependencies=false' | %w(a a_2 c) - 'has_external_dependencies=true,false' | %w(a a_2 b c) - 'has_external_dependencies=true|has_external_dependencies=false' | %w(a a_2 b c) - 'has_external_dependencies!=true' | %w(a a_2 c) + 'has_external_dependencies=false' | %w(a a:2 c) + 'has_external_dependencies=true,false' | %w(a a:2 b c) + '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=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,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) # name 'name=a' | %w(a) 'name=a,b' | %w(a b) - 'name=a,a_2|name=b' | %w(a a_2 b) - 'name!=a,a_2' | %w(b c) + 'name=a,a:2|name=b' | %w(a a:2 b) + 'name!=a,a:2' | %w(b c) # resource_boundary 'resource_boundary=memory' | %w(b c) 'resource_boundary=memory,cpu' | %w(a b c) 'resource_boundary=memory|resource_boundary=cpu' | %w(a b c) - 'resource_boundary!=memory,cpu' | %w(a_2) + '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&latency_sensitive=true' | %w(a:2) + 'feature_category=category_a&latency_sensitive=true|feature_category=category_c' | %w(a:2 c) end with_them do |