Exclude knife integration tests on server platforms

Not all platforms (looking at you solaris) need bother running the knife tests
because we don't consider them to be workstation platforms. Excluding them
will reduce transient failures and speed up the tests.

17 files changed, 19 insertions, 16 deletions

diff --git a/spec/integration/knife/chef_fs_data_store_spec.rb b/spec/integration/knife/chef_fs_data_store_spec.rb
index c6737e08cb..a4d62673de 100644
--- a/spec/integration/knife/chef_fs_data_store_spec.rb
+++ b/spec/integration/knife/chef_fs_data_store_spec.rb
@@ -22,7 +22,7 @@ require 'chef/knife/show'
 require 'chef/knife/raw'
 require 'chef/knife/cookbook_upload'
 
-describe 'ChefFSDataStore tests' do
+describe 'ChefFSDataStore tests', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/chef_repo_path_spec.rb b/spec/integration/knife/chef_repo_path_spec.rb
index 90455ed374..874b33901f 100644
--- a/spec/integration/knife/chef_repo_path_spec.rb
+++ b/spec/integration/knife/chef_repo_path_spec.rb
@@ -20,7 +20,7 @@ require 'support/shared/context/config'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'chef_repo_path tests' do
+describe 'chef_repo_path tests', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/chef_repository_file_system_spec.rb b/spec/integration/knife/chef_repository_file_system_spec.rb
index ff86924e22..34afd228f3 100644
--- a/spec/integration/knife/chef_repository_file_system_spec.rb
+++ b/spec/integration/knife/chef_repository_file_system_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'General chef_repo file system checks' do
+describe 'General chef_repo file system checks', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/chefignore_spec.rb b/spec/integration/knife/chefignore_spec.rb
index b09959b581..34bf391f88 100644
--- a/spec/integration/knife/chefignore_spec.rb
+++ b/spec/integration/knife/chefignore_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'chefignore tests' do
+describe 'chefignore tests', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/common_options_spec.rb b/spec/integration/knife/common_options_spec.rb
index 7a48f14ad3..dfc1e024f9 100644
--- a/spec/integration/knife/common_options_spec.rb
+++ b/spec/integration/knife/common_options_spec.rb
@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/knife/raw'
 
-describe 'knife common options' do
+describe 'knife common options', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/cookbook_api_ipv6_spec.rb b/spec/integration/knife/cookbook_api_ipv6_spec.rb
index c5b5b81abe..e59c8912bd 100644
--- a/spec/integration/knife/cookbook_api_ipv6_spec.rb
+++ b/spec/integration/knife/cookbook_api_ipv6_spec.rb
@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/mixin/shell_out'
 
-describe "Knife cookbook API integration with IPv6" do
+describe "Knife cookbook API integration with IPv6", :workstation do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
diff --git a/spec/integration/knife/delete_spec.rb b/spec/integration/knife/delete_spec.rb
index e56469e102..733a7ef72b 100644
--- a/spec/integration/knife/delete_spec.rb
+++ b/spec/integration/knife/delete_spec.rb
@@ -20,7 +20,7 @@ require 'chef/knife/delete'
 require 'chef/knife/list'
 require 'chef/knife/raw'
 
-describe 'knife delete' do
+describe 'knife delete', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/deps_spec.rb b/spec/integration/knife/deps_spec.rb
index 2cbb7b8f74..8b4d71906b 100644
--- a/spec/integration/knife/deps_spec.rb
+++ b/spec/integration/knife/deps_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/deps'
 
-describe 'knife deps' do
+describe 'knife deps', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/diff_spec.rb b/spec/integration/knife/diff_spec.rb
index 62b491d6ef..c12ebbcf8f 100644
--- a/spec/integration/knife/diff_spec.rb
+++ b/spec/integration/knife/diff_spec.rb
@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/knife/diff'
 
-describe 'knife diff' do
+describe 'knife diff', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb
index 17779d1f47..0c2b907f1e 100644
--- a/spec/integration/knife/download_spec.rb
+++ b/spec/integration/knife/download_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/download'
 require 'chef/knife/diff'
 
-describe 'knife download' do
+describe 'knife download', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/list_spec.rb b/spec/integration/knife/list_spec.rb
index c9632e146d..3d8b83001d 100644
--- a/spec/integration/knife/list_spec.rb
+++ b/spec/integration/knife/list_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/list'
 
-describe 'knife list' do
+describe 'knife list', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/raw_spec.rb b/spec/integration/knife/raw_spec.rb
index fad69e4e11..2b49d2ebb2 100644
--- a/spec/integration/knife/raw_spec.rb
+++ b/spec/integration/knife/raw_spec.rb
@@ -20,7 +20,7 @@ require 'support/shared/context/config'
 require 'chef/knife/raw'
 require 'chef/knife/show'
 
-describe 'knife raw' do
+describe 'knife raw', :workstation do
   include IntegrationSupport
   include KnifeSupport
   include AppServerSupport
diff --git a/spec/integration/knife/redirection_spec.rb b/spec/integration/knife/redirection_spec.rb
index 549a6f6df0..77bda99453 100644
--- a/spec/integration/knife/redirection_spec.rb
+++ b/spec/integration/knife/redirection_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/list'
 
-describe 'redirection' do
+describe 'redirection', :workstation do
   include IntegrationSupport
   include KnifeSupport
   include AppServerSupport
diff --git a/spec/integration/knife/serve_spec.rb b/spec/integration/knife/serve_spec.rb
index 32e633543d..3c859b794e 100644
--- a/spec/integration/knife/serve_spec.rb
+++ b/spec/integration/knife/serve_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/serve'
 require 'chef/server_api'
 
-describe 'knife serve' do
+describe 'knife serve', :workstation do
   include IntegrationSupport
   include KnifeSupport
   include AppServerSupport
diff --git a/spec/integration/knife/show_spec.rb b/spec/integration/knife/show_spec.rb
index 4a71499e87..bc7f1cf6d3 100644
--- a/spec/integration/knife/show_spec.rb
+++ b/spec/integration/knife/show_spec.rb
@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/show'
 
-describe 'knife show' do
+describe 'knife show', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/integration/knife/upload_spec.rb b/spec/integration/knife/upload_spec.rb
index 380711bf4f..dade476889 100644
--- a/spec/integration/knife/upload_spec.rb
+++ b/spec/integration/knife/upload_spec.rb
@@ -21,7 +21,7 @@ require 'chef/knife/diff'
 require 'chef/knife/raw'
 require 'chef/json_compat'
 
-describe 'knife upload' do
+describe 'knife upload', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8abd5f59af..1760aab871 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -97,6 +97,9 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.filter_run_excluding :external => true
 
+  # Only run these tests on platforms that are also chef workstations
+  config.filter_run_excluding :workstation if solaris?
+
   # Tests that randomly fail, but may have value.
   config.filter_run_excluding :volatile => true
   config.filter_run_excluding :volatile_on_solaris => true if solaris?