Break out the gpg key validation into its own methodapt_repo_cleanup

This logic was entirely different than the key validation and doing them in the same block didn't make any sense. This makes it a lot easier to follow as well since there isn't the cmd variable that requires searching the code to see what we're actually running

Signed-off-by: Tim Smith <tsmith@chef.io>

1 files changed, 23 insertions, 0 deletions

diff --git a/spec/unit/provider/apt_repository_spec.rb b/spec/unit/provider/apt_repository_spec.rb
index 05eba821dd..ca85831a06 100644
--- a/spec/unit/provider/apt_repository_spec.rb
+++ b/spec/unit/provider/apt_repository_spec.rb
@@ -66,6 +66,17 @@ describe Chef::Provider::AptRepository do
     double("shell_out", stdout: GPG_FINGER, exitstatus: 0, error?: false)
   end
 
+  let(:gpg_shell_out_success) do
+    double("shell_out", :stdout => "pub  2048R/7BD9BF62 2011-08-19 nginx signing key <signing-key@nginx.com>",
+                        :exitstatus => 0, :error? => false)
+  end
+
+  let(:gpg_shell_out_failure) do
+    double("shell_out", :stderr => "gpg: no valid OpenPGP data found.\n
+                                    gpg: processing message failed: eof",
+                        :exitstatus => 1, :error? => true)
+  end
+
   let(:apt_fingerprints) do
     %w{630239CC130E1A7FD81A27B140976EAF437D05B5
 C5986B4F1257FFA86632CBA746181433FBB75451
@@ -240,4 +251,16 @@ C5986B4F1257FFA86632CBA746181433FBB75451
       expect(provider.build_repo("ppa:chef/main", "unstable", "main", false, nil)).to eql(target)
     end
   end
+
+  describe "#keyfile_is_invalid?" do
+    it "returns true if the file is invalid" do
+      expect(provider).to receive(:shell_out).and_return(gpg_shell_out_failure)
+      expect(provider.keyfile_is_invalid?("/foo/bar.key")).to be_truthy
+    end
+
+    it "returns false if the file is valid" do
+      expect(provider).to receive(:shell_out).and_return(gpg_shell_out_success)
+      expect(provider.keyfile_is_invalid?("/foo/bar.key")).to be_falsey
+    end
+  end
 end