summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Duarte <john.duarte@puppetlabs.com>2014-06-14 08:02:45 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-06-16 13:54:16 -0700
commit47b32a8d380beb48e0ea85be904c48da0405e982 (patch)
treef7dbb4b37bdf0856fadf24f3bfbe0168de79b81f
parenta1d74e33c237f64ee9edb14e53644447b6c962ed (diff)
downloadpuppet-vcsrepo-47b32a8d380beb48e0ea85be904c48da0405e982.tar.gz
puppet-vcsrepo-47b32a8d380beb48e0ea85be904c48da0405e982.tar.bz2
Change tests to not install git-daemon on debian
The git-daemon is not a valid package on debian based systems. Update tests to not try installing git-daemon on debian systems.
-rw-r--r--spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb2
-rw-r--r--spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb2
-rw-r--r--spec/acceptance/beaker/git/clone/clone_git.rb2
-rw-r--r--spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb2
-rw-r--r--spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb2
-rw-r--r--spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb2
-rw-r--r--spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb2
-rw-r--r--spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb2
8 files changed, 8 insertions, 8 deletions
diff --git a/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb b/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb
index 67544bf..628c627 100644
--- a/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb
+++ b/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb
@@ -16,7 +16,7 @@ hosts.each do |host|
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb
index 8afa813..837e170 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb
@@ -13,7 +13,7 @@ hosts.each do |host|
on(host, "cd #{tmpdir} && ./create_git_repo.sh")
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end
diff --git a/spec/acceptance/beaker/git/clone/clone_git.rb b/spec/acceptance/beaker/git/clone/clone_git.rb
index 8a810af..7656860 100644
--- a/spec/acceptance/beaker/git/clone/clone_git.rb
+++ b/spec/acceptance/beaker/git/clone/clone_git.rb
@@ -12,7 +12,7 @@ hosts.each do |host|
on(host, "cd #{tmpdir} && ./create_git_repo.sh")
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb
index 6147549..04238ea 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb
@@ -13,7 +13,7 @@ hosts.each do |host|
on(host, "cd #{tmpdir} && ./create_git_repo.sh")
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
index 52349d7..2994bb5 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
@@ -12,7 +12,7 @@ hosts.each do |host|
on(host, "cd #{tmpdir} && ./create_git_repo.sh")
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
index b83f4ea..3ceb58e 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
@@ -12,7 +12,7 @@ hosts.each do |host|
on(host, "cd #{tmpdir} && ./create_git_repo.sh")
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb
index 694626e..44b0324 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb
@@ -13,7 +13,7 @@ hosts.each do |host|
on(host, "cd #{tmpdir} && ./create_git_repo.sh")
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
index 1fb61b6..4110d05 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
@@ -13,7 +13,7 @@ hosts.each do |host|
on(host, "cd #{tmpdir} && ./create_git_repo.sh")
end
step 'setup - start git daemon' do
- install_package(host, 'git-daemon')
+ install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
on(host, "git daemon --base-path=#{tmpdir} --export-all --reuseaddr --verbose --detach")
end