summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/clone/negative
diff options
context:
space:
mode:
authorJohn Duarte <john.duarte@puppetlabs.com>2014-06-14 11:57:07 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-06-16 13:55:53 -0700
commite6a561125b6477051c339d5dfce909e4318f504c (patch)
tree697084e56663be03f8739a94fabb73393d61564a /spec/acceptance/beaker/git/clone/negative
parent36969f9a2fe8952f162ef1dea9cfa95ed16c1907 (diff)
downloadpuppet-vcsrepo-e6a561125b6477051c339d5dfce909e4318f504c.tar.gz
puppet-vcsrepo-e6a561125b6477051c339d5dfce909e4318f504c.tar.bz2
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.
Diffstat (limited to 'spec/acceptance/beaker/git/clone/negative')
-rw-r--r--spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb6
-rw-r--r--spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb6
2 files changed, 10 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb b/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb
index 8adb1af..6826673 100644
--- a/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb
+++ b/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
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")
diff --git a/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb b/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb
index 2264015..9805355 100644
--- a/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb
+++ b/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb
@@ -8,7 +8,11 @@ exclude1 = "`exec \"rm -rf /tmp\"`"
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")