From 5c06ba5a9800c01ddeeffe527fb95feba2a5081a Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 27 Apr 2020 13:45:49 -0700 Subject: Remove git func test for upstream The output of this command seems to vary too much over different git versions to make it reliable and actually work. We should find something here that works, but determining what git commands to use which are stable for parsing can be very difficult. Signed-off-by: Lamont Granquist --- spec/functional/resource/git_spec.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'spec/functional') diff --git a/spec/functional/resource/git_spec.rb b/spec/functional/resource/git_spec.rb index 0355b59233..ca1bd30893 100644 --- a/spec/functional/resource/git_spec.rb +++ b/spec/functional/resource/git_spec.rb @@ -74,11 +74,6 @@ describe Chef::Resource::Git, requires_git: true do expect(rev_ver).to eq(version) end - def expect_branch_upstream_to_be(branch, upstream) - branch_upstream = shell_out("git", "rev-parse", "--abbrev-ref", "#{branch}@{upstream}", cwd: deploy_directory).stdout.strip - expect(branch_upstream).to eq(upstream) - end - def expect_branch_to_be(branch) head_branch = shell_out!("git name-rev --name-only HEAD", cwd: deploy_directory).stdout.strip expect(head_branch).to eq(branch) @@ -219,7 +214,6 @@ describe Chef::Resource::Git, requires_git: true do git deploy_directory do repository origin_repo end.should_be_updated - expect_branch_upstream_to_be("master", "origin/master") expect_revision_to_be("HEAD", rev_head) expect_branch_to_be("master") end -- cgit v1.2.1