From 9524dac77410215229f3a07722b037d287068902 Mon Sep 17 00:00:00 2001 From: Jaymala Sinha Date: Thu, 27 Apr 2017 09:56:02 -0400 Subject: [PATCH] Add skip-chef-zero-quirks to the defaults in chef-zero as the user acls are not currently supported here Related to https://github.com/chef/chef-server/pull/1242 Signed-off-by: Jaymala Sinha --- spec/run_oc_pedant.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index c68681c4..c11eb4a1 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -130,12 +130,6 @@ def args_from_env(key) "--skip-organizations", "--skip-multiuser", "--skip-user-keys", - - # chef-zero has some non-removable quirks, such as the fact that files - # with 255-character names cannot be stored in local mode. This is - # reserved only for quirks that are *irrevocable* and by design; and - # should barely be used at all. - "--skip-chef-zero-quirks", ] else [] @@ -183,6 +177,14 @@ def args_from_env(key) # The universe endpoint is unlikely to ever make sense for Chef Zero "--skip-universe", + + # chef-zero has some non-removable quirks, such as the fact that files + # with 255-character names cannot be stored in local mode. This is + # reserved only for quirks that are *irrevocable* and by design; and + # should barely be used at all. This is also used to skip the user acl + # tests from chef-server as the user acls are not supported in chef-zero + # at this time. + "--skip-chef-zero-quirks", ] # The knife tests are very slow and don't give us a lot of extra coverage,