Merge pull request #262 from chef/jsinha/POOL-423

Add skip-chef-zero-quirks to the defaults in chef-zero
chef · May 2, 2017 · 0888dee · 0888dee
2 parents 949a0ca + 9524dac
commit 0888dee
Showing 1 changed file with 8 additions and 6 deletions.
diff --git 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,