diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-04-23 17:33:59 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-04-23 17:33:59 -0700 |
| commit | 676e29ae623fd529a0cc77ce832c7d73374f21a6 (patch) | |
| tree | 4c9c41ab293a3949607b764e3f5f1c9d568384d5 | |
| parent | 7ae451d72c7547ab4469785929007476f05c3c28 (diff) | |
| download | chef-676e29ae623fd529a0cc77ce832c7d73374f21a6.tar.gz | |
remove upstream test of deploy branch
git isn't back consistent results for this API, i'm not sure
what the correct stable API is to get this info from git.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | spec/functional/resource/git_spec.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/functional/resource/git_spec.rb b/spec/functional/resource/git_spec.rb index 6d4d889adc..0355b59233 100644 --- a/spec/functional/resource/git_spec.rb +++ b/spec/functional/resource/git_spec.rb @@ -76,11 +76,7 @@ describe Chef::Resource::Git, requires_git: true do def expect_branch_upstream_to_be(branch, upstream) branch_upstream = shell_out("git", "rev-parse", "--abbrev-ref", "#{branch}@{upstream}", cwd: deploy_directory).stdout.strip - if upstream.nil? - expect(branch_upstream).to eq("") - else - expect(branch_upstream).to eq(upstream) - end + expect(branch_upstream).to eq(upstream) end def expect_branch_to_be(branch) @@ -244,7 +240,6 @@ describe Chef::Resource::Git, requires_git: true do repository origin_repo checkout_branch "deploy" end.should_be_updated - expect_branch_upstream_to_be("deploy", nil) expect_revision_to_be("HEAD", rev_head) expect_branch_to_be("deploy") end |