Implement rsync-retry

Author: mblaschke

tests/serverspec/Gemfile

@@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gem 'rake'
 gem 'rspec-core'
+gem 'rspec-retry'
 gem 'json'
 gem 'serverspec'
 gem 'docker-api'

tests/serverspec/Gemfile.lock

@@ -28,6 +28,8 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
+    rspec-retry (0.5.3)
+      rspec-core (> 3.3, < 3.6)
     rspec-support (3.5.0)
     serverspec (2.37.2)
       multi_json
@@ -49,6 +51,7 @@ DEPENDENCIES
   json
   rake
   rspec-core
+  rspec-retry
   serverspec
 
 BUNDLED WITH

tests/serverspec/Rakefile

@@ -1,6 +1,13 @@
 require 'rake'
 require 'rspec/core/rake_task'
 
+RSpec.configure do |config|
+  # show retry status in spec process
+  config.verbose_retry = true
+  # show exception that triggers a retry if verbose_retry is set to true
+  config.display_try_failure_messages = true
+end
+
 RSpec::Core::RakeTask.new(:"spec") do |t, args|
   #t.pattern = 'spec/base/*_spec.rb'
 end

tests/serverspec/spec/collection/apache.rb

@@ -8,8 +8,6 @@
     include_examples 'apache::modules'
     include_examples 'apache::service::running'
 
-    wait_retry 30 do
-        include_examples 'web::test::pi'
-    end
+    include_examples 'web::test::pi'
 end
 

tests/serverspec/spec/collection/hhvm.rb

@@ -12,7 +12,5 @@
 end
 
 shared_examples 'collection::hhvm::webserver-test' do
-    wait_retry 30 do
-        include_examples 'php::fpm::test::sha1'
-    end
+    include_examples 'php::fpm::test::sha1'
 end

tests/serverspec/spec/collection/nginx.rb

@@ -7,8 +7,6 @@
     # test after services are up
     include_examples 'nginx::service::running'
 
-    wait_retry 30 do
-        include_examples 'web::test::pi'
-    end
+    include_examples 'web::test::pi'
 end
 

tests/serverspec/spec/collection/php-fpm5.rb

@@ -21,28 +21,24 @@
 
 
 shared_examples 'collection::php-fpm5::webserver-test::development' do
-    wait_retry 30 do
-        include_examples 'php-fpm::modules'
-        include_examples 'php-fpm5::modules'
-        include_examples 'php-fpm::modules::development'
-        include_examples 'php::fpm::test::sha1'
-        include_examples 'php::fpm::test::php_ini_scanned_files'
-        include_examples 'php::fpm::test::php_sapi_name'
-        include_examples 'php::fpm::test::process_user_id'
-        include_examples 'php5::fpm::test::version'
-    end
+    include_examples 'php-fpm::modules'
+    include_examples 'php-fpm5::modules'
+    include_examples 'php-fpm::modules::development'
+    include_examples 'php::fpm::test::sha1'
+    include_examples 'php::fpm::test::php_ini_scanned_files'
+    include_examples 'php::fpm::test::php_sapi_name'
+    include_examples 'php::fpm::test::process_user_id'
+    include_examples 'php5::fpm::test::version'
 end
 
 shared_examples 'collection::php-fpm5::webserver-test::production' do
-    wait_retry 30 do
-        include_examples 'php-fpm::modules'
-        include_examples 'php-fpm5::modules'
-        include_examples 'php-fpm::modules::production'
-        include_examples 'php::fpm::test::sha1'
-        include_examples 'php::fpm::test::php_ini_scanned_files'
-        include_examples 'php::fpm::test::php_sapi_name'
-        include_examples 'php::fpm::test::process_user_id'
-        include_examples 'php5::fpm::test::version'
-    end
+    include_examples 'php-fpm::modules'
+    include_examples 'php-fpm5::modules'
+    include_examples 'php-fpm::modules::production'
+    include_examples 'php::fpm::test::sha1'
+    include_examples 'php::fpm::test::php_ini_scanned_files'
+    include_examples 'php::fpm::test::php_sapi_name'
+    include_examples 'php::fpm::test::process_user_id'
+    include_examples 'php5::fpm::test::version'
 end
 

tests/serverspec/spec/collection/php-fpm7.rb

@@ -22,29 +22,25 @@
 
 
 shared_examples 'collection::php-fpm7::webserver-test::development' do
-    wait_retry 30 do
-        include_examples 'php-fpm::modules'
-        include_examples 'php-fpm7::modules'
-        include_examples 'php-fpm::modules::development'
-        include_examples 'php::fpm::test::sha1'
-        include_examples 'php::fpm::test::php_ini_scanned_files'
-        include_examples 'php::fpm::test::php_sapi_name'
-        include_examples 'php::fpm::test::process_user_id'
-        include_examples 'php7::fpm::test::version'
-    end
+    include_examples 'php-fpm::modules'
+    include_examples 'php-fpm7::modules'
+    include_examples 'php-fpm::modules::development'
+    include_examples 'php::fpm::test::sha1'
+    include_examples 'php::fpm::test::php_ini_scanned_files'
+    include_examples 'php::fpm::test::php_sapi_name'
+    include_examples 'php::fpm::test::process_user_id'
+    include_examples 'php7::fpm::test::version'
 end
 
 
 shared_examples 'collection::php-fpm7::webserver-test::production' do
-    wait_retry 30 do
-        include_examples 'php-fpm::modules'
-        include_examples 'php-fpm7::modules'
-        include_examples 'php-fpm::modules::production'
-        include_examples 'php::fpm::test::sha1'
-        include_examples 'php::fpm::test::php_ini_scanned_files'
-        include_examples 'php::fpm::test::php_sapi_name'
-        include_examples 'php::fpm::test::process_user_id'
-        include_examples 'php7::fpm::test::version'
-    end
+    include_examples 'php-fpm::modules'
+    include_examples 'php-fpm7::modules'
+    include_examples 'php-fpm::modules::production'
+    include_examples 'php::fpm::test::sha1'
+    include_examples 'php::fpm::test::php_ini_scanned_files'
+    include_examples 'php::fpm::test::php_sapi_name'
+    include_examples 'php::fpm::test::process_user_id'
+    include_examples 'php7::fpm::test::version'
 end
 

tests/serverspec/spec/docker/vsftp_spec.rb

@@ -8,8 +8,8 @@
         set :docker_image, @image.id
     end
 
-    include_examples 'collection::bootstrap'
-    include_examples 'collection::base'
+    #include_examples 'collection::bootstrap'
+    #include_examples 'collection::base'
     include_examples 'collection::vsftp'
 
 end

tests/serverspec/spec/shared/apache/listening.rb

@@ -1,9 +1,7 @@
 shared_examples 'apache::listening::public' do
     describe port(80) do
-        it "apache should be listening" do
-            wait_retry 30 do
-                should be_listening
-             end
+        it "apache should be listening", :retry => 5, :retry_wait => 10 do
+            should be_listening
         end
     end
 end