From d6b22213f2cea9b58d5e2fa48f4fea2227c184ef Mon Sep 17 00:00:00 2001
From: John Duarte <john.duarte@puppetlabs.com>
Date: Mon, 19 May 2014 11:53:54 -0700
Subject: Move protocol tests to beaker suite

The protocol tests are more closely aligned with the rest of the beaker test
suite. The beaker tests have received more vetting, so the setup and teardown
process should be less prone to failure on repeated execution.
---
 .../acceptance/beaker/git/clone/clone_file_path.rb | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 spec/acceptance/beaker/git/clone/clone_file_path.rb

(limited to 'spec/acceptance/beaker/git/clone/clone_file_path.rb')

diff --git a/spec/acceptance/beaker/git/clone/clone_file_path.rb b/spec/acceptance/beaker/git/clone/clone_file_path.rb
new file mode 100644
index 0000000..b76e9b9
--- /dev/null
+++ b/spec/acceptance/beaker/git/clone/clone_file_path.rb
@@ -0,0 +1,42 @@
+test_name 'C3426 - clone (file path)'
+
+# Globals
+repo_name = 'testrepo_clone'
+
+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 'clone with puppet' do
+    pp = <<-EOS
+    vcsrepo { "#{tmpdir}/#{repo_name}":
+      ensure => present,
+      source => "#{tmpdir}/testrepo.git",
+      provider => git,
+    }
+    EOS
+
+    apply_manifest_on(host, pp)
+    apply_manifest_on(host, pp)
+  end
+
+  step "verify checkout is on the master branch" do
+    on(host, "ls #{tmpdir}/#{repo_name}/.git/") do |res|
+      fail_test('checkout not found') unless res.stdout.include? "HEAD"
+    end
+
+    on(host, "cat #{tmpdir}/#{repo_name}/.git/HEAD") do |res|
+      fail_test('master not found') unless res.stdout.include? "ref: refs/heads/master"
+    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/clone/clone_file_path.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/acceptance/beaker/git/clone/clone_file_path.rb')

diff --git a/spec/acceptance/beaker/git/clone/clone_file_path.rb b/spec/acceptance/beaker/git/clone/clone_file_path.rb
index b76e9b9..616030c 100644
--- a/spec/acceptance/beaker/git/clone/clone_file_path.rb
+++ b/spec/acceptance/beaker/git/clone/clone_file_path.rb
@@ -25,8 +25,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 checkout is on the master branch" 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/clone/clone_file_path.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'spec/acceptance/beaker/git/clone/clone_file_path.rb')

diff --git a/spec/acceptance/beaker/git/clone/clone_file_path.rb b/spec/acceptance/beaker/git/clone/clone_file_path.rb
index 616030c..a57e05a 100644
--- a/spec/acceptance/beaker/git/clone/clone_file_path.rb
+++ b/spec/acceptance/beaker/git/clone/clone_file_path.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 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