Update specs and fix FM-1361

Gemfile

@@ -4,9 +4,6 @@ group :development, :test do
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'rspec-system',            :require => false
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
   gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false

lib/puppet/provider/vcsrepo/git.rb

@@ -9,16 +9,15 @@
   has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user, :depth
 
   def create
+    if @resource.value(:revision) and @resource.value(:ensure) == :bare
+      fail("Cannot set a revision (#{@resource.value(:revision)}) on a bare repository")
+    end
     if !@resource.value(:source)
       init_repository(@resource.value(:path))
     else
       clone_repository(@resource.value(:source), @resource.value(:path))
       if @resource.value(:revision)
-        if @resource.value(:ensure) == :bare
-          notice "Ignoring revision for bare repository"
-        else
-          checkout
-        end
+        checkout
       end
       if @resource.value(:ensure) != :bare
         update_submodules

spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb

@@ -38,7 +38,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep '#{ruby} #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
   end
 
   step 'checkout with puppet using basic auth' do
@@ -52,8 +52,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout" do

spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb

@@ -46,7 +46,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep '#{ruby} #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
   end
 
   step 'checkout with puppet using basic auth' do
@@ -60,8 +60,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout" do

spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb

@@ -22,7 +22,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'pkill -9 git-daemon')
+    on(host, 'pkill -9 git-daemon ; sleep 1')
   end
 
   step 'checkout with puppet using basic auth' do
@@ -36,8 +36,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout (silent error for basic auth using git protocol)" do

spec/acceptance/beaker/git/branch_checkout/branch_checkout_file.rb

@@ -27,8 +27,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the #{branch} branch" do

spec/acceptance/beaker/git/branch_checkout/branch_checkout_file_path.rb

@@ -27,8 +27,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the #{branch} branch" do

spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb

@@ -19,7 +19,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'pkill -9 git-daemon')
+    on(host, 'pkill -9 git-daemon ; sleep 1')
   end
 
   step 'checkout a branch with puppet' do
@@ -32,8 +32,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the #{branch} branch" do

spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb

@@ -27,7 +27,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
   end
 
   step 'checkout a branch with puppet' do
@@ -40,8 +40,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the #{branch} branch" do

spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb

@@ -34,7 +34,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
   end
 
   step 'checkout a branch with puppet' do
@@ -47,8 +47,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the #{branch} branch" do

spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb

@@ -14,17 +14,18 @@
   end
   step 'setup - establish ssh keys' do
     # create ssh keys
-    on(host, 'ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
+    on(host, 'yes | ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
 
     # copy public key to authorized_keys
+    on(host, 'cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys')
     on(host, 'echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config')
     on(host, 'chown -R root:root /root/.ssh')
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }")
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }", :catch_failures => true)
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }", :catch_failures => true)
   end
 
   step 'checkout a branch with puppet' do
@@ -37,8 +38,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the #{branch} branch" do

spec/acceptance/beaker/git/branch_checkout/branch_checkout_ssh.rb

@@ -14,17 +14,18 @@
   end
   step 'setup - establish ssh keys' do
     # create ssh keys
-    on(host, 'ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
+    on(host, 'yes | ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
 
     # copy public key to authorized_keys
+    on(host, 'cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys')
     on(host, 'echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config')
     on(host, 'chown -R root:root /root/.ssh')
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }")
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }", :catch_failures => true)
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }", :catch_failures => true)
   end
 
   step 'checkout a branch with puppet' do
@@ -37,8 +38,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the #{branch} branch" do

spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb

@@ -26,8 +26,7 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :expect_failures => true)
   end
 
   step 'verify that master branch is checked out' do

spec/acceptance/beaker/git/clone/clone_file.rb

@@ -25,8 +25,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the master branch" do

spec/acceptance/beaker/git/clone/clone_file_path.rb

@@ -25,8 +25,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the master branch" do

spec/acceptance/beaker/git/clone/clone_git.rb

@@ -18,7 +18,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'pkill -9 git-daemon')
+    on(host, 'pkill -9 git-daemon ; sleep 1')
   end
 
   step 'clone with puppet' do
@@ -30,8 +30,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the master branch" do

spec/acceptance/beaker/git/clone/clone_http.rb

@@ -26,7 +26,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
   end
 
   step 'clone with puppet' do
@@ -38,8 +38,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the master branch" do

spec/acceptance/beaker/git/clone/clone_https.rb

@@ -33,7 +33,7 @@
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh ; sleep 1")
   end
 
   step 'clone with puppet' do
@@ -45,8 +45,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the master branch" do

spec/acceptance/beaker/git/clone/clone_over_different_exiting_repo_with_force.rb

@@ -32,7 +32,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step 'verify new repo has replaced old one' do

spec/acceptance/beaker/git/clone/clone_repo_with_excludes_in_repo.rb

@@ -28,8 +28,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step 'verify exludes are known to git' do

spec/acceptance/beaker/git/clone/clone_repo_with_excludes_not_in_repo.rb

@@ -28,8 +28,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step 'verify exludes are known to git' do

spec/acceptance/beaker/git/clone/clone_scp.rb

@@ -13,17 +13,18 @@
   end
   step 'setup - establish ssh keys' do
     # create ssh keys
-    on(host, 'ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
+    on(host, 'yes | ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
 
     # copy public key to authorized_keys
+    on(host, 'cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys')
     on(host, 'echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config')
     on(host, 'chown -R root:root /root/.ssh')
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }")
-      apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }")
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }", :catch_failures => true)
+    apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }", :catch_failures => true)
   end
 
   step 'clone with puppet' do
@@ -35,8 +36,8 @@
     }
     EOS
 
-    apply_manifest_on(host, pp)
-    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp, :catch_failures => true)
+    apply_manifest_on(host, pp, :catch_changes  => true)
   end
 
   step "verify checkout is on the master branch" do