inspec 0.9.10 → 0.9.11

data/test/integration/.kitchen/logs/default-fedora-21-i386.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.193471 #11606]  INFO -- default-fedora-21-i386: -----> Destroying <default-fedora-21-i386>...
-I, [2016-01-24T16:12:07.193781 #11606]  INFO -- default-fedora-21-i386: Finished destroying <default-fedora-21-i386> (0m0.00s).

data/test/integration/.kitchen/logs/default-fedora-21.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.193104 #11606]  INFO -- default-fedora-21: -----> Destroying <default-fedora-21>...
-I, [2016-01-24T16:12:07.193355 #11606]  INFO -- default-fedora-21: Finished destroying <default-fedora-21> (0m0.00s).

data/test/integration/.kitchen/logs/default-fedora-22.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:29.159178 #96612]  INFO -- default-fedora-22: -----> Destroying <default-fedora-22>...
+I, [2016-01-29T18:18:29.427875 #96612]  INFO -- default-fedora-22: EC2 instance <i-b738b90b> destroyed.
+I, [2016-01-29T18:18:29.428400 #96612]  INFO -- default-fedora-22: Finished destroying <default-fedora-22> (0m0.27s).

data/test/integration/.kitchen/logs/default-freebsd-102.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.194676 #11606]  INFO -- default-freebsd-102: -----> Destroying <default-freebsd-102>...
-I, [2016-01-24T16:12:07.195143 #11606]  INFO -- default-freebsd-102: Finished destroying <default-freebsd-102> (0m0.00s).

data/test/integration/.kitchen/logs/default-freebsd-93.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.194301 #11606]  INFO -- default-freebsd-93: -----> Destroying <default-freebsd-93>...
-I, [2016-01-24T16:12:07.194552 #11606]  INFO -- default-freebsd-93: Finished destroying <default-freebsd-93> (0m0.00s).

data/test/integration/.kitchen/logs/default-mint-172-cinnamon.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.199765 #11606]  INFO -- default-mint-172-cinnamon: -----> Destroying <default-mint-172-cinnamon>...
-I, [2016-01-24T16:12:07.200088 #11606]  INFO -- default-mint-172-cinnamon: Finished destroying <default-mint-172-cinnamon> (0m0.00s).

data/test/integration/.kitchen/logs/default-opensuse-132-i386.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.196063 #11606]  INFO -- default-opensuse-132-i386: -----> Destroying <default-opensuse-132-i386>...
-I, [2016-01-24T16:12:07.196544 #11606]  INFO -- default-opensuse-132-i386: Finished destroying <default-opensuse-132-i386> (0m0.00s).

data/test/integration/.kitchen/logs/default-opensuse-132-x86-64.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.195391 #11606]  INFO -- default-opensuse-132-x86-64: -----> Destroying <default-opensuse-132-x86-64>...
-I, [2016-01-24T16:12:07.195808 #11606]  INFO -- default-opensuse-132-x86-64: Finished destroying <default-opensuse-132-x86-64> (0m0.00s).

data/test/integration/.kitchen/logs/default-redhat-65.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:27.722177 #96612]  INFO -- default-redhat-65: -----> Destroying <default-redhat-65>...
+I, [2016-01-29T18:18:27.959176 #96612]  INFO -- default-redhat-65: EC2 instance <i-ca38b976> destroyed.
+I, [2016-01-29T18:18:27.960524 #96612]  INFO -- default-redhat-65: Finished destroying <default-redhat-65> (0m0.24s).

data/test/integration/.kitchen/logs/default-redhat-71.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:27.961358 #96612]  INFO -- default-redhat-71: -----> Destroying <default-redhat-71>...
+I, [2016-01-29T18:18:28.228198 #96612]  INFO -- default-redhat-71: EC2 instance <i-4238b9fe> destroyed.
+I, [2016-01-29T18:18:28.229964 #96612]  INFO -- default-redhat-71: Finished destroying <default-redhat-71> (0m0.27s).

data/test/integration/.kitchen/logs/default-suse-11sp3.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:26.706567 #96612]  INFO -- default-suse-11sp3: -----> Destroying <default-suse-11sp3>...
+I, [2016-01-29T18:18:27.453489 #96612]  INFO -- default-suse-11sp3: EC2 instance <i-b938b905> destroyed.
+I, [2016-01-29T18:18:27.454121 #96612]  INFO -- default-suse-11sp3: Finished destroying <default-suse-11sp3> (0m0.75s).

data/test/integration/.kitchen/logs/default-suse-12.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:27.454966 #96612]  INFO -- default-suse-12: -----> Destroying <default-suse-12>...
+I, [2016-01-29T18:18:27.719270 #96612]  INFO -- default-suse-12: EC2 instance <i-4538b9f9> destroyed.
+I, [2016-01-29T18:18:27.721314 #96612]  INFO -- default-suse-12: Finished destroying <default-suse-12> (0m0.26s).

data/test/integration/.kitchen/logs/default-ubuntu-1004-i386.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.199317 #11606]  INFO -- default-ubuntu-1004-i386: -----> Destroying <default-ubuntu-1004-i386>...
-I, [2016-01-24T16:12:07.199645 #11606]  INFO -- default-ubuntu-1004-i386: Finished destroying <default-ubuntu-1004-i386> (0m0.00s).

data/test/integration/.kitchen/logs/default-ubuntu-1004.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.198852 #11606]  INFO -- default-ubuntu-1004: -----> Destroying <default-ubuntu-1004>...
-I, [2016-01-24T16:12:07.199193 #11606]  INFO -- default-ubuntu-1004: Finished destroying <default-ubuntu-1004> (0m0.00s).

data/test/integration/.kitchen/logs/default-ubuntu-1204-i386.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.198374 #11606]  INFO -- default-ubuntu-1204-i386: -----> Destroying <default-ubuntu-1204-i386>...
-I, [2016-01-24T16:12:07.198711 #11606]  INFO -- default-ubuntu-1204-i386: Finished destroying <default-ubuntu-1204-i386> (0m0.00s).

data/test/integration/.kitchen/logs/default-ubuntu-1204.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:28.232601 #96612]  INFO -- default-ubuntu-1204: -----> Destroying <default-ubuntu-1204>...
+I, [2016-01-29T18:18:28.575969 #96612]  INFO -- default-ubuntu-1204: EC2 instance <i-3c39b880> destroyed.
+I, [2016-01-29T18:18:28.576602 #96612]  INFO -- default-ubuntu-1204: Finished destroying <default-ubuntu-1204> (0m0.34s).

data/test/integration/.kitchen/logs/default-ubuntu-1404-i386.log

@@ -1,2 +0,0 @@
-I, [2016-01-24T16:12:07.197214 #11606]  INFO -- default-ubuntu-1404-i386: -----> Destroying <default-ubuntu-1404-i386>...
-I, [2016-01-24T16:12:07.197515 #11606]  INFO -- default-ubuntu-1404-i386: Finished destroying <default-ubuntu-1404-i386> (0m0.00s).

data/test/integration/.kitchen/logs/default-ubuntu-1404.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:28.577693 #96612]  INFO -- default-ubuntu-1404: -----> Destroying <default-ubuntu-1404>...
+I, [2016-01-29T18:18:28.882177 #96612]  INFO -- default-ubuntu-1404: EC2 instance <i-b838b904> destroyed.
+I, [2016-01-29T18:18:28.883859 #96612]  INFO -- default-ubuntu-1404: Finished destroying <default-ubuntu-1404> (0m0.30s).

data/test/integration/.kitchen/logs/default-ubuntu-1510.log

@@ -0,0 +1,3 @@
+I, [2016-01-29T18:18:28.884908 #96612]  INFO -- default-ubuntu-1510: -----> Destroying <default-ubuntu-1510>...
+I, [2016-01-29T18:18:29.156782 #96612]  INFO -- default-ubuntu-1510: EC2 instance <i-3d39b881> destroyed.
+I, [2016-01-29T18:18:29.158221 #96612]  INFO -- default-ubuntu-1510: Finished destroying <default-ubuntu-1510> (0m0.27s).

data/test/integration/.kitchen/logs/default-windows-2012r2.log

@@ -1,41 +1,2 @@
-I, [2016-01-25T17:25:07.497657 #42763]  INFO -- default-windows-2012r2: -----> Creating <default-windows-2012r2>...
-I, [2016-01-25T17:25:07.498020 #42763]  INFO -- default-windows-2012r2: If you are not using an account that qualifies under the AWS
-free-tier, you may be charged to run these suites. The charge
-should be minimal, but neither Test Kitchen nor its maintainers
-are responsible for your incurred costs.
-
-E, [2016-01-25T17:25:07.834439 #42763] ERROR -- default-windows-2012r2: Create failed on instance <default-windows-2012r2>.
-E, [2016-01-25T17:25:07.834698 #42763] ERROR -- default-windows-2012r2: ------Exception-------
-E, [2016-01-25T17:25:07.834716 #42763] ERROR -- default-windows-2012r2: Class: Aws::EC2::Errors::AuthFailure
-E, [2016-01-25T17:25:07.834726 #42763] ERROR -- default-windows-2012r2: Message: Not authorized for images: [ami-f2f5f9ef]
-E, [2016-01-25T17:25:07.834735 #42763] ERROR -- default-windows-2012r2: ------Backtrace-------
-E, [2016-01-25T17:25:07.834743 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-core-2.2.13/lib/seahorse/client/plugins/raise_response_errors.rb:15:in `call'
-E, [2016-01-25T17:25:07.834755 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-core-2.2.13/lib/aws-sdk-core/plugins/param_converter.rb:20:in `call'
-E, [2016-01-25T17:25:07.834765 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-core-2.2.13/lib/seahorse/client/plugins/response_target.rb:21:in `call'
-E, [2016-01-25T17:25:07.834773 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-core-2.2.13/lib/seahorse/client/request.rb:70:in `send_request'
-E, [2016-01-25T17:25:07.834782 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-core-2.2.13/lib/seahorse/client/base.rb:207:in `block (2 levels) in define_operation_methods'
-E, [2016-01-25T17:25:07.834791 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-resources-2.2.13/lib/aws-sdk-resources/request.rb:24:in `call'
-E, [2016-01-25T17:25:07.834799 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-resources-2.2.13/lib/aws-sdk-resources/operations.rb:41:in `call'
-E, [2016-01-25T17:25:07.834808 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-resources-2.2.13/lib/aws-sdk-resources/operations.rb:87:in `call'
-E, [2016-01-25T17:25:07.834816 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/aws-sdk-resources-2.2.13/lib/aws-sdk-resources/operation_methods.rb:19:in `block in add_operation'
-E, [2016-01-25T17:25:07.834825 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/kitchen-ec2-0.10.0/lib/kitchen/driver/aws/client.rb:82:in `create_instance'
-E, [2016-01-25T17:25:07.834833 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/kitchen-ec2-0.10.0/lib/kitchen/driver/ec2.rb:291:in `submit_server'
-E, [2016-01-25T17:25:07.834842 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/kitchen-ec2-0.10.0/lib/kitchen/driver/ec2.rb:192:in `create'
-E, [2016-01-25T17:25:07.834853 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:431:in `public_send'
-E, [2016-01-25T17:25:07.834862 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:431:in `block in perform_action'
-E, [2016-01-25T17:25:07.834871 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:495:in `call'
-E, [2016-01-25T17:25:07.834931 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:495:in `synchronize_or_call'
-E, [2016-01-25T17:25:07.834943 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:460:in `block in action'
-E, [2016-01-25T17:25:07.834952 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/2.2.0/benchmark.rb:288:in `measure'
-E, [2016-01-25T17:25:07.834961 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:459:in `action'
-E, [2016-01-25T17:25:07.834969 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:431:in `perform_action'
-E, [2016-01-25T17:25:07.834977 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:359:in `create_action'
-E, [2016-01-25T17:25:07.834986 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:348:in `block in transition_to'
-E, [2016-01-25T17:25:07.834994 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:347:in `each'
-E, [2016-01-25T17:25:07.835005 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:347:in `transition_to'
-E, [2016-01-25T17:25:07.835015 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/instance.rb:138:in `converge'
-E, [2016-01-25T17:25:07.835023 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/command.rb:176:in `public_send'
-E, [2016-01-25T17:25:07.835032 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/test-kitchen-1.5.0/lib/kitchen/command.rb:176:in `block (2 levels) in run_action'
-E, [2016-01-25T17:25:07.835040 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/logging-2.0.0/lib/logging/diagnostic_context.rb:448:in `call'
-E, [2016-01-25T17:25:07.835049 #42763] ERROR -- default-windows-2012r2: /Users/chartmann/.rvm/rubies/ruby-2.2.1/lib/ruby/gems/2.2.0/gems/logging-2.0.0/lib/logging/diagnostic_context.rb:448:in `block in create_with_logging_context'
-E, [2016-01-25T17:25:07.835057 #42763] ERROR -- default-windows-2012r2: ----------------------
+I, [2016-01-29T18:18:26.704447 #96612]  INFO -- default-windows-2012r2: -----> Destroying <default-windows-2012r2>...
+I, [2016-01-29T18:18:26.705620 #96612]  INFO -- default-windows-2012r2: Finished destroying <default-windows-2012r2> (0m0.00s).

data/test/integration/.kitchen/logs/kitchen.log

@@ -0,0 +1,14 @@
+I, [2016-01-29T18:18:25.774560 #96612]  INFO -- Kitchen: -----> Starting Kitchen (v1.5.0)
+I, [2016-01-29T18:18:26.704395 #96612]  INFO -- Kitchen: -----> Destroying <default-windows-2012r2>...
+I, [2016-01-29T18:18:26.706532 #96612]  INFO -- Kitchen: -----> Destroying <default-suse-11sp3>...
+I, [2016-01-29T18:18:27.454920 #96612]  INFO -- Kitchen: -----> Destroying <default-suse-12>...
+I, [2016-01-29T18:18:27.722146 #96612]  INFO -- Kitchen: -----> Destroying <default-redhat-65>...
+I, [2016-01-29T18:18:27.961328 #96612]  INFO -- Kitchen: -----> Destroying <default-redhat-71>...
+I, [2016-01-29T18:18:28.232545 #96612]  INFO -- Kitchen: -----> Destroying <default-ubuntu-1204>...
+I, [2016-01-29T18:18:28.577646 #96612]  INFO -- Kitchen: -----> Destroying <default-ubuntu-1404>...
+I, [2016-01-29T18:18:28.884854 #96612]  INFO -- Kitchen: -----> Destroying <default-ubuntu-1510>...
+I, [2016-01-29T18:18:29.159142 #96612]  INFO -- Kitchen: -----> Destroying <default-fedora-22>...
+I, [2016-01-29T18:18:29.429401 #96612]  INFO -- Kitchen: -----> Destroying <default-debian-8>...
+I, [2016-01-29T18:18:29.682464 #96612]  INFO -- Kitchen: -----> Destroying <default-centos-7>...
+I, [2016-01-29T18:18:29.918558 #96612]  INFO -- Kitchen: -----> Destroying <default-aws-linux>...
+I, [2016-01-29T18:18:30.349123 #96612]  INFO -- Kitchen: -----> Kitchen is finished. (0m4.57s)

data/test/integration/bootstrap.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "hello I am here"

data/test/integration/cookbooks/os_prepare/recipes/file.rb

@@ -11,6 +11,8 @@ if node['platform_family'] != 'windows'
           'system'
         when 'freebsd'
           'wheel'
+        when 'solaris', 'solaris2'
+          'sys'
         else
           'root'
         end

data/test/integration/cookbooks/os_prepare/recipes/json_yaml_csv_ini.rb

@@ -9,6 +9,8 @@ gid = case node['platform_family']
         'system'
       when 'freebsd'
         'wheel'
+      when 'solaris', 'solaris2'
+        'sys'
       else
         'root'
       end

data/test/integration/cookbooks/os_prepare/recipes/mount.rb

@@ -4,26 +4,30 @@
 #
 # file mount tests
 
-# copy iso file for mount tests
-# NB created using `mkdir empty; mkisofs -o empty.iso empty/`
-cookbook_file '/root/empty.iso' do
-  owner 'root'
-  group 'root'
-  mode '0755'
-  action :create
-end
+case node['platform']
+when 'ubuntu', 'rhel', 'centos', 'fedora'
 
-# create mount directory
-directory '/mnt/iso-disk' do
-  owner 'root'
-  group 'root'
-  mode '0755'
-  action :create
-end
+  # copy iso file for mount tests
+  # NB created using `mkdir empty; mkisofs -o empty.iso empty/`
+  cookbook_file '/root/empty.iso' do
+    owner 'root'
+    group 'root'
+    mode '0755'
+    action :create
+  end
+
+  # create mount directory
+  directory '/mnt/iso-disk' do
+    owner 'root'
+    group 'root'
+    mode '0755'
+    action :create
+  end
 
-# mount -o loop /root/empty.iso /mnt/iso-disk
-mount '/mnt/iso-disk' do
-  device '/root/empty.iso'
-  options 'loop'
-  action [:mount, :enable]
+  # mount -o loop /root/empty.iso /mnt/iso-disk
+  mount '/mnt/iso-disk' do
+    device '/root/empty.iso'
+    options 'loop'
+    action [:mount, :enable]
+  end
 end

data/test/integration/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb

@@ -1,3 +1,2 @@
 #!/bin/sh
-exec > /dev/null
-exec yes 
+exec tail -f /dev/null

data/test/integration/test/integration/default/_debug_spec.rb

@@ -1 +1 @@
-p "You are currently running on OS family: #{os[:family] || 'unknown'}, OS release: #{os[:release] || 'unknown'}"
+p "You are currently running on OS: #{os[:name] || 'unknown'}, OS release: #{os[:release] || 'unknown'}, OS family: #{os[:family] || 'unknown'}"

data/test/integration/test/integration/default/compare_matcher_spec.rb

@@ -1,19 +1,21 @@
 # encoding: utf-8
 
-# uses the `cmp` matcher instead of the eq matcher
-describe sshd_config do
-  its('Port') { should eq '22' }
-  its('Port') { should_not eq 22 }
+if os.linux?
+  # uses the `cmp` matcher instead of the eq matcher
+  describe sshd_config do
+    its('Port') { should eq '22' }
+    its('Port') { should_not eq 22 }
 
-  its('Port') { should cmp '22' }
-  its('Port') { should cmp 22 }
-  its('Port') { should cmp 22.0 }
-  its('Port') { should_not cmp 22.1 }
+    its('Port') { should cmp '22' }
+    its('Port') { should cmp 22 }
+    its('Port') { should cmp 22.0 }
+    its('Port') { should_not cmp 22.1 }
 
-  its('LogLevel') { should eq 'INFO' }
-  its('LogLevel') { should_not eq 'info'}
+    its('LogLevel') { should eq 'INFO' }
+    its('LogLevel') { should_not eq 'info'}
 
-  its('LogLevel') { should cmp 'INFO' }
-  its('LogLevel') { should cmp 'info' }
-  its('LogLevel') { should cmp 'InfO' }
+    its('LogLevel') { should cmp 'INFO' }
+    its('LogLevel') { should cmp 'info' }
+    its('LogLevel') { should cmp 'InfO' }
+  end
 end

data/test/integration/test/integration/default/etc_group_spec.rb

@@ -1,13 +1,14 @@
 # encoding: utf-8
 
-root_group = case os[:family]
-             when 'aix'
-               'system'
-             when 'freebsd'
-               'wheel'
-             else
-               'root'
-             end
+root_group = 'root'
+
+if os[:family] == 'aix'
+  root_group = 'system'
+elsif os[:family] == 'freebsd'
+  root_group = 'wheel'
+elsif os.solaris?
+  root_group = 'sys'
+end
 
 if os.unix?
   describe etc_group do

data/test/integration/test/integration/default/file_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
-case os[:family]
-when 'freebsd'
+if os[:family] == 'freebsd'
   filedata = {
     user: 'root',
     group: 'wheel',
@@ -9,7 +8,7 @@ when 'freebsd'
     dir_md5sum: '598f4fe64aefab8f00bcbea4c9239abf',
     dir_sha256sum: '9b4fb24edd6d1d8830e272398263cdbf026b97392cc35387b991dc0248a628f9',
   }
-when 'aix'
+elsif os[:family] == 'aix'
   filedata = {
     user: 'root',
     group: 'system',
@@ -17,6 +16,14 @@ when 'aix'
     dir_md5sum: nil,
     dir_sha256sum: nil,
   }
+elsif os.solaris?
+  filedata = {
+    user: 'root',
+    group: 'sys',
+    dir_content: nil,
+    dir_md5sum: nil,
+    dir_sha256sum: nil,
+  }
 else
   filedata = {
     user: 'root',
@@ -116,7 +123,9 @@ if os.unix?
     its('group') { should eq filedata[:group] }
     its('type') { should eq :directory }
   end
+end
 
+if os.linux?
   # for server spec compatibility
   # Do not use `.with` or `.only_with`, this syntax is deprecated and will be removed
   # in InSpec version 1
@@ -140,8 +149,9 @@ if os.unix?
       })
     }
   end
+end
 
-elsif os.windows?
+if os.windows?
   describe file('C:\\Windows') do
     it { should exist }
     it { should be_directory }

data/test/integration/test/integration/default/group_spec.rb

@@ -11,10 +11,7 @@ if os.linux?
     it { should_not exist }
     its('gid') { should eq nil }
   end
-end
-
-if os[:family] == 'freebsd'
-
+elsif os[:family] == 'freebsd'
   describe group('wheel') do
     it { should exist }
     its('gid') { should eq 0 }
@@ -29,9 +26,7 @@ if os[:family] == 'freebsd'
     it { should_not exist }
     its('gid') { should eq nil }
   end
-end
-
-if os[:family] == 'aix'
+elsif os[:family] == 'aix'
   describe group('system') do
     it { should exist }
     its('gid') { should eq 0 }
@@ -42,6 +37,21 @@ if os[:family] == 'aix'
     its('gid') { should eq 2 }
   end
 
+  describe group('noroot') do
+    it { should_not exist }
+    its('gid') { should eq nil }
+  end
+elsif os.solaris?
+  describe group('root') do
+    it { should exist }
+    its('gid') { should eq 0 }
+  end
+
+  describe group('bin') do
+    it { should exist }
+    its('gid') { should eq 2 }
+  end
+
   describe group('noroot') do
     it { should_not exist }
     its('gid') { should eq nil }

data/test/integration/test/integration/default/mount_spec.rb

@@ -1,10 +1,12 @@
 # encoding: utf-8
 
-# instead of `.with` or `.only_with` we recommend to use the `mount` resource
-describe mount '/mnt/iso-disk' do
-  it { should be_mounted }
-  its('count') { should eq  1 }
-  its('device') { should eq '/root/empty.iso' }
-  its('type') { should eq  'iso9660' }
-  its('options') { should eq  ['ro'] }
+if os.linux?
+  # instead of `.with` or `.only_with` we recommend to use the `mount` resource
+  describe mount '/mnt/iso-disk' do
+    it { should be_mounted }
+    its('count') { should eq  1 }
+    its('device') { should eq '/root/empty.iso' }
+    its('type') { should eq  'iso9660' }
+    its('options') { should eq  ['ro'] }
+  end
 end

data/test/integration/test/integration/default/package_spec.rb

@@ -10,6 +10,22 @@ when 'aix'
     it { should be_installed }
     its('version') { should match /^(6|7)[.|\d]+\d$/ }
   end
+when 'solaris'
+
+  if os[:release] == '11'
+    pkg = 'system/file-system/zfs'
+    ver = /^0\.5.+$/
+  else
+    pkg = 'SUNWzfsr'
+    ver = /^11\.10.+$/
+  end
+
+  describe package(pkg) do
+    it { should be_installed }
+    its('version') { should match ver }
+  end
+
+
 end
 
 describe package('nginx') do

data/test/integration/test/integration/default/port_spec.rb

@@ -1,15 +1,21 @@
 # encoding: utf-8
 
+# check that ssh runs
 if os.unix?
-  # check that ssh runs
   describe port(22) do
     it { should be_listening }
     its('protocols') { should include('tcp') }
     its('protocols') { should_not include('udp') }
-    its('processes') { should include 'sshd' }
   end
 
   describe port(65432) do
     it { should_not be_listening }
   end
 end
+
+# extra test for linux
+if os.linux?
+  describe port(22) do
+    its('processes') { should include 'sshd' }
+  end
+end