From 591725e0f2a0dd0dd31b0086dbd4068bd302b0e1 Mon Sep 17 00:00:00 2001
From: John Duarte <john.duarte@puppetlabs.com>
Date: Sat, 10 May 2014 21:13:03 -0700
Subject: Move git tests into sub-directory

---
 .../git/compression/compression_6_checkout.rb      | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 spec/acceptance/beaker/git/compression/compression_6_checkout.rb

(limited to 'spec/acceptance/beaker/git/compression/compression_6_checkout.rb')

diff --git a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
new file mode 100644
index 0000000..0a2d5d5
--- /dev/null
+++ b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
@@ -0,0 +1,39 @@
+test_name 'C3501 - checkout with compression 6'
+
+# Globals
+repo_name = 'testrepo_checkout'
+
+hosts.each do |host|
+  tmpdir = host.tmpdir('vcsrepo')
+  step 'setup - create repo' do
+    install_package(host, 'git')
+    my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
+    scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
+    on(host, "cd #{tmpdir} && ./create_git_repo.sh")
+  end
+
+  teardown do
+    on(host, "rm -fr #{tmpdir}")
+  end
+
+  step 'checkout with compression 6 with puppet' do
+    pp = <<-EOS
+    vcsrepo { "#{tmpdir}/#{repo_name}":
+      ensure => present,
+      source => "file://#{tmpdir}/testrepo.git",
+      provider => git,
+      compression => 6,
+    }
+    EOS
+
+    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp)
+  end
+
+  step 'verify git repo was checked out' do
+    on(host, "ls #{tmpdir}/#{repo_name}/.git/") do |res|
+      fail_test('checkout not found') unless res.stdout.include? "HEAD"
+    end
+  end
+
+end
-- 
cgit v1.2.3


From 0d9e938e92a25673c3712866e2d2108a255b67d5 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Tue, 20 May 2014 18:15:03 -0700
Subject: Update specs and fix FM-1361

- Add install.rb for pre-suite
- Add catches for failures/changes to manifest application
- Correct root ssh key copying
- Add sleeps for killing processes releasing ports
- Fix FM-1361
---
 spec/acceptance/beaker/git/compression/compression_6_checkout.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/acceptance/beaker/git/compression/compression_6_checkout.rb')

diff --git a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
index 0a2d5d5..a8376d7 100644
--- a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
@@ -26,8 +26,8 @@ hosts.each do |host|
     }
     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 git repo was checked out' do
-- 
cgit v1.2.3


From e6a561125b6477051c339d5dfce909e4318f504c Mon Sep 17 00:00:00 2001
From: John Duarte <john.duarte@puppetlabs.com>
Date: Sat, 14 Jun 2014 11:57:07 -0700
Subject: Accomodate ubuntu-10 package for git in beaker tests

Add conditional to install `git-core` if the platform under test
is ubuntu-10. The `git` package is not available for this platform.
---
 spec/acceptance/beaker/git/compression/compression_6_checkout.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'spec/acceptance/beaker/git/compression/compression_6_checkout.rb')

diff --git a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
index a8376d7..2f6b075 100644
--- a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
-- 
cgit v1.2.3