diff options
author | Thom May <thom@may.lt> | 2017-05-02 10:06:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-02 10:06:24 +0100 |
commit | 0888deece36b15362f1d1eae9543c26b157dfd9c (patch) | |
tree | 8998d000b9cb747d80b262d2d450659feac0bf66 | |
parent | 949a0ca56613280cb64c87c328b3407e63d60947 (diff) | |
parent | 9524dac77410215229f3a07722b037d287068902 (diff) | |
download | chef-zero-0888deece36b15362f1d1eae9543c26b157dfd9c.tar.gz |
Merge pull request #262 from chef/jsinha/POOL-423
Add skip-chef-zero-quirks to the defaults in chef-zero
-rw-r--r-- | spec/run_oc_pedant.rb | 14 |
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, |