From 14a7ef591b68ebb4d901c2f2a9a1553be0e7af03 Mon Sep 17 00:00:00 2001
From: JCount <JCount42@gmail.com>
Date: Tue, 4 Apr 2017 17:25:54 -0400
Subject: [PATCH] gpg_spec: switch structure to if/else instead of rescue
---
Library/Homebrew/test/gpg_spec.rb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Library/Homebrew/test/gpg_spec.rb b/Library/Homebrew/test/gpg_spec.rb
index bca807f3bf..f0c8f0a3f4 100644
--- a/Library/Homebrew/test/gpg_spec.rb
+++ b/Library/Homebrew/test/gpg_spec.rb
@@ -12,11 +12,13 @@ describe Gpg do
shutup do
subject.create_test_key(dir)
+ gpg = subject::GPG_EXECUTABLE
+ @version = Utils.popen_read(gpg, "--version")[/\d\.\d/, 0]
end
- begin
+ if @version.to_s.start_with?("2.1")
expect(dir/".gnupg/pubring.kbx").to be_file
- rescue RSpec::Expectations::ExpectationNotMetError
+ else
expect(dir/".gnupg/secring.gpg").to be_file
end
end
--
GitLab