From ba37ce083d4594840edcf3020f856f9e9b18edd9 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@leap.se>
Date: Wed, 22 May 2013 17:23:18 +0000
Subject: [PATCH] Explicitly set the passphrase on one of the unittest keys.

---
 tests/test_gnupg.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/test_gnupg.py b/tests/test_gnupg.py
index 7c63504..f6563a1 100644
--- a/tests/test_gnupg.py
+++ b/tests/test_gnupg.py
@@ -658,11 +658,12 @@ class GPGTestCase(unittest.TestCase):
         log.debug("test_deletion ends")
 
     def test_encryption(self):
-        """Test encryption of a message string."""
+        """Test encryption of a message string"""
         key = self.generate_key("Craig Gentry", "xorr.ox",
                                 passphrase="craiggentry")
         gentry = key.fingerprint
-        key = self.generate_key("Marten van Dijk", "xorr.ox")
+        key = self.generate_key("Marten van Dijk", "xorr.ox",
+                                passphrase="martenvandijk")
         dijk = key.fingerprint
         gpg = self.gpg
         message = """
@@ -672,8 +673,10 @@ transparent multi-hop wireless backhauls that are able to perform statistical
 analysis of different kinds of data (temperature, humidity, etc.)  coming from
 a WSN while ensuring both end-to-end encryption and hop-by-hop
 authentication."""
-        encrypted = str(gpg.encrypt(message, dijk))
-        self.assertNotEqual(message, encrypted, "Data must have changed")
+        encrypted = str(gpg.encrypt(message, [dijk], ))
+        self.assertNotEqual(message, encrypted)
+        self.assertNotEqual(encrypted, '')
+        self.assertGreater(len(encrypted), 0)
 
     def test_encryption_alt_encoding(self):
         """Test encryption with latin-1 encoding"""