[DRE-commits] [schleuder] 15/26: debian/patches/foo: ok

[Georg Faerber]

This is an automated email from the git hooks/post-receive script.

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit 1e1fc4d28b61e5d23c6127ef34cdbe0905f081d3
Author: Georg Faerber <georg at riseup.net>
Date:   Tue Jan 31 15:51:35 2017 +0100

    debian/patches/foo: ok
---
 debian/patches/foo | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/patches/foo b/debian/patches/foo
index e002c45..36ed71a 100644
--- a/debian/patches/foo
+++ b/debian/patches/foo
@@ -17,16 +17,20 @@
    def start_smtp_daemon
 --- a/spec/schleuder/integration/cli_spec.rb
 +++ b/spec/schleuder/integration/cli_spec.rb
-@@ -90,6 +90,8 @@
+@@ -90,6 +90,12 @@
  
    context '#refresh_keys' do
      it 'updates one key from the keyserver' do
-+      ENV['GNUPGHOME'] = 'spec/gnupg'
++      FileUtils.mkdir_p(list.listdir)
++      gpghome_upstream = File.join "spec", "gnupg"
++      FileUtils.cp_r Dir["#{gpghome_upstream}/{*.conf,private*,*.gpg,.*migrated}"], list.listdir 
++      ENV['GNUPGHOME'] = list.listdir
 +      `dirmngr`
++
        list = create(:list)
        list.subscribe("admin at example.org", nil, true)
        list.import_key(File.read("spec/fixtures/expired_key.txt"))
-@@ -104,9 +106,13 @@
+@@ -104,9 +110,17 @@
        expect(mail.to_s).to include("98769E8A1091F36BD88403ECF71A3F8412D83889 was updated (new signatures)")
  
        teardown_list_and_mailer(list)
@@ -35,12 +39,16 @@
      end
  
      it 'reports errors from refreshing keys' do
-+      ENV['GNUPGHOME'] = 'spec/gnupg'
++      FileUtils.mkdir_p(list.listdir)
++      gpghome_upstream = File.join "spec", "gnupg"
++      FileUtils.cp_r Dir["#{gpghome_upstream}/{*.conf,private*,*.gpg,.*migrated}"], list.listdir 
++      ENV['GNUPGHOME'] = list.listdir
 +      `dirmngr`
++
        list = create(:list)
        list.subscribe("admin at example.org", nil, true)
        list.import_key(File.read("spec/fixtures/expired_key.txt"))
-@@ -124,6 +130,8 @@
+@@ -124,6 +138,8 @@
        end
  
        teardown_list_and_mailer(list)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder.git