summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaymala Sinha <jsinha@chef.io>2017-04-27 09:56:02 -0400
committerJaymala Sinha <jsinha@chef.io>2017-04-27 12:38:09 -0400
commitcb35d321957dab62bb26db226b653c95ab508c25 (patch)
tree598a61427f2532f06cc0a84abe1cb6fe50896079
parentf8fedad60de7978f008e720d4638e81f76b69085 (diff)
downloadchef-zero-jsinha/5-Stable-POOL-423.tar.gz
Add skip-chef-zero-quirks to the defaults in chef-zerojsinha/5-Stable-POOL-423
as the user acls are not currently supported here Related to https://github.com/chef/chef-server/pull/1242 Signed-off-by: Jaymala Sinha <jsinha@chef.io>
-rw-r--r--spec/run_oc_pedant.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index c68681c..c11eb4a 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -130,12 +130,6 @@ begin
"--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 @@ begin
# 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,