summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJohn Duarte <john.duarte@puppetlabs.com>2014-05-11 12:00:21 -0700
committerJohn Duarte <john.duarte@puppetlabs.com>2014-05-18 11:38:19 -0700
commit4040e4a1cccc72692c00d5efc06f8e8d5e1174f1 (patch)
treec450ae7e81b6b74b97f14d8ff5cbb057355e69b2 /spec
parenteaf1e2d77754bc5f9070274f2c4da9409a003208 (diff)
downloadpuppet-vcsrepo-4040e4a1cccc72692c00d5efc06f8e8d5e1174f1.tar.gz
puppet-vcsrepo-4040e4a1cccc72692c00d5efc06f8e8d5e1174f1.tar.bz2
Update expectations for shallow clone
Diffstat (limited to 'spec')
-rw-r--r--spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb (renamed from spec/acceptance/beaker/git/shallow_clone/shallow_clone_file_path.rb)10
-rw-r--r--spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb (renamed from spec/acceptance/beaker/git/shallow_clone/shallow_clone_http.rb)10
2 files changed, 6 insertions, 14 deletions
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_file_path.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb
index d9d18ce..9cebe45 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_file_path.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb
@@ -30,13 +30,9 @@ hosts.each do |host|
apply_manifest_on(host, pp)
end
- step 'verify checkout is shallow and of the correct depth' do
- on(host, "ls #{tmpdir}/#{repo_name}/.git/") do |res|
- fail_test('shallow not found') unless res.stdout.include? "shallow"
- end
-
- on(host, "wc -l #{tmpdir}/#{repo_name}/.git/shallow") do |res|
- fail_test('shallow not found') unless res.stdout.include? "2 #{tmpdir}/#{repo_name}/.git/shallow"
+ step 'git does not support shallow clone via file path: verify checkout is NOT created' do
+ on(host, "ls #{tmpdir}") do |res|
+ fail_test('checkout found') if res.stdout.include? "#{repo_name}"
end
end
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_http.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
index ad7e30e..f80239b 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_http.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
@@ -42,13 +42,9 @@ hosts.each do |host|
apply_manifest_on(host, pp)
end
- step 'verify checkout is shallow and of the correct depth' do
- on(host, "ls #{tmpdir}/#{repo_name}/.git/") do |res|
- fail_test('shallow not found') unless res.stdout.include? "shallow"
- end
-
- on(host, "wc -l #{tmpdir}/#{repo_name}/.git/shallow") do |res|
- fail_test('shallow not found') unless res.stdout.include? "2 #{tmpdir}/#{repo_name}/.git/shallow"
+ step 'git does not support shallow clone via HTTP: verify checkout is NOT created' do
+ on(host, "ls #{tmpdir}") do |res|
+ fail_test('checkout found') if res.stdout.include? "#{repo_name}"
end
end