From f76bc6b7b40c0a96a3669bb7c2577aee8f213be0 Mon Sep 17 00:00:00 2001
From: Steven Danna <steve@chef.io>
Date: Wed, 3 Aug 2016 16:41:27 +0100
Subject: [PATCH] Be a bit louder when skipping an entire integration suite

---
 test/integration/default/_debug_spec.rb           |  9 ++++++++-
 test/integration/default/apache_conf_spec.rb      | 11 ++++++++---
 test/integration/default/etc_group_spec.rb        |  6 ++++--
 test/integration/default/file_spec.rb             |  7 ++++---
 test/integration/default/iptables_spec.rb         |  7 ++++---
 test/integration/default/kernel_module_spec.rb    | 11 ++++++++---
 test/integration/default/kernel_parameter_spec.rb |  7 ++++---
 test/integration/default/mount_spec.rb            | 11 ++++++++---
 test/integration/default/port_spec.rb             |  7 ++++---
 test/integration/default/postgres_session_spec.rb |  7 ++++---
 test/integration/default/service_spec.rb          |  7 ++++---
 11 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/test/integration/default/_debug_spec.rb b/test/integration/default/_debug_spec.rb
index 6f2ab06d6..3e8a92c54 100644
--- a/test/integration/default/_debug_spec.rb
+++ b/test/integration/default/_debug_spec.rb
@@ -1 +1,8 @@
-p "You are currently running on OS: #{os[:name] || 'unknown'}, OS release: #{os[:release] || 'unknown'}, OS family: #{os[:family] || 'unknown'}"
+puts "-----------------------------------"
+puts "        TEST ENVIRONMENT           "
+puts "-----------------------------------"
+puts "    Docker: #{!ENV['DOCKER'].nil?}"
+puts "   OS name: #{os[:name] || 'unknown' }"
+puts "OS release: #{os[:release] || 'unknown'}"
+puts " OS family: #{os[:family] || 'unknown'}"
+puts "-----------------------------------"
diff --git a/test/integration/default/apache_conf_spec.rb b/test/integration/default/apache_conf_spec.rb
index a4e0c42b0..5c27e97aa 100644
--- a/test/integration/default/apache_conf_spec.rb
+++ b/test/integration/default/apache_conf_spec.rb
@@ -1,8 +1,13 @@
 # encoding: utf-8
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
-return unless os.linux?
+if !os.linux?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on linux.\033[0m"
+  return
+end
 
 # direct access to params of apache conf
 describe apache_conf do
diff --git a/test/integration/default/etc_group_spec.rb b/test/integration/default/etc_group_spec.rb
index e9c058913..9f8481abb 100644
--- a/test/integration/default/etc_group_spec.rb
+++ b/test/integration/default/etc_group_spec.rb
@@ -1,7 +1,9 @@
 # encoding: utf-8
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # lets define our own group
 root_group = 'root'
diff --git a/test/integration/default/file_spec.rb b/test/integration/default/file_spec.rb
index 840c85534..6015c2d07 100644
--- a/test/integration/default/file_spec.rb
+++ b/test/integration/default/file_spec.rb
@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 if os[:family] == 'freebsd'
   filedata = {
diff --git a/test/integration/default/iptables_spec.rb b/test/integration/default/iptables_spec.rb
index 2c03c5dea..a8a690a31 100644
--- a/test/integration/default/iptables_spec.rb
+++ b/test/integration/default/iptables_spec.rb
@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 case os[:family]
 when 'ubuntu', 'fedora'
diff --git a/test/integration/default/kernel_module_spec.rb b/test/integration/default/kernel_module_spec.rb
index f855d79d6..a7807e3da 100644
--- a/test/integration/default/kernel_module_spec.rb
+++ b/test/integration/default/kernel_module_spec.rb
@@ -1,8 +1,13 @@
 # encoding: utf-8
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
-return unless os.linux?
+if !os.linux?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on linux.\033[0m"
+  return
+end
 
 # Test kernel modules on all linux systems
 describe kernel_module('video') do
diff --git a/test/integration/default/kernel_parameter_spec.rb b/test/integration/default/kernel_parameter_spec.rb
index d4c2a7f15..5ef603755 100644
--- a/test/integration/default/kernel_parameter_spec.rb
+++ b/test/integration/default/kernel_parameter_spec.rb
@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # prepare values
 if ['ubuntu', 'centos', 'fedora', 'opensuse', 'debian'].include?(os[:family])
diff --git a/test/integration/default/mount_spec.rb b/test/integration/default/mount_spec.rb
index e92fbd5b7..dbe79cf04 100644
--- a/test/integration/default/mount_spec.rb
+++ b/test/integration/default/mount_spec.rb
@@ -1,8 +1,13 @@
 # encoding: utf-8
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
-return unless os.linux?
+if !os.linux?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on linux.\033[0m"
+  return
+end
 
 # instead of `.with` or `.only_with` we recommend to use the `mount` resource
 describe mount '/mnt/iso-disk' do
diff --git a/test/integration/default/port_spec.rb b/test/integration/default/port_spec.rb
index 726bdbf5b..45307a07a 100644
--- a/test/integration/default/port_spec.rb
+++ b/test/integration/default/port_spec.rb
@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # check that ssh runs
 if os.unix?
diff --git a/test/integration/default/postgres_session_spec.rb b/test/integration/default/postgres_session_spec.rb
index a673deca9..96008084c 100644
--- a/test/integration/default/postgres_session_spec.rb
+++ b/test/integration/default/postgres_session_spec.rb
@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # postgres-server is installed on these platforms
 if ['ubuntu', 'centos'].include? os['family']
diff --git a/test/integration/default/service_spec.rb b/test/integration/default/service_spec.rb
index e72c5a644..c182af615 100644
--- a/test/integration/default/service_spec.rb
+++ b/test/integration/default/service_spec.rb
@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # based on operating system we select the available service
 if ['centos', 'fedora', 'freebsd', 'opensuse'].include?(os[:family])