diff options
| author | John Duarte <john.duarte@puppetlabs.com> | 2014-05-21 18:17:31 -0700 |
|---|---|---|
| committer | John Duarte <john.duarte@puppetlabs.com> | 2014-05-21 18:17:31 -0700 |
| commit | 2f875839afe843bd8a9f320d553fb3a28a7420f8 (patch) | |
| tree | 681e6f1b03ca99eed51ad2bec40b9a3b192ee48f /spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb | |
| parent | 9057fca3a6862e699c153f3607e57f2360552eb7 (diff) | |
| parent | 0d9e938e92a25673c3712866e2d2108a255b67d5 (diff) | |
Merge pull request #145 from hunner/fix_beaker_tests
Update specs and fix FM-1361
Diffstat (limited to 'spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb')
| -rw-r--r-- | spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb index ecd51ad..956d7de 100644 --- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb +++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb @@ -26,7 +26,7 @@ hosts.each do |host| teardown do on(host, "rm -fr #{tmpdir}") - on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh') + on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh ; sleep 1') end step 'shallow clone repo with puppet' do @@ -39,8 +39,7 @@ hosts.each do |host| } EOS - apply_manifest_on(host, pp) - apply_manifest_on(host, pp) + apply_manifest_on(host, pp, :expect_failures => true) end step 'git does not support shallow clone via HTTP: verify checkout is NOT created' do |