Correct shallow clone count
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 18:31:13 +0000 (11:31 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 18:31:13 +0000 (11:31 -0700)
The manifest is set to clone at a depth of 1, but checks for a shallow
depth of 2. It should either checkout a depth of 2, or only check for a
depth of 1.

This commit makes it check for a depth of 1

spec/acceptance/beaker/git/shallow_clone/shallow_clone_file.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_scp.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_ssh.rb

index f54f1ab..e68bbd4 100644 (file)
@@ -36,7 +36,7 @@ hosts.each do |host|
     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"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index ab3bd07..b83f4ea 100644 (file)
@@ -41,7 +41,7 @@ hosts.each do |host|
     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"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index 93a328c..c045018 100644 (file)
@@ -57,7 +57,7 @@ hosts.each do |host|
     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"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index ddef4e7..1201710 100644 (file)
@@ -47,7 +47,7 @@ hosts.each do |host|
     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"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index da5528c..76f2a46 100644 (file)
@@ -47,7 +47,7 @@ hosts.each do |host|
     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"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end