From ae0ab0a7c7269238ee0d91997219766b3ffe1f35 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@leap.se>
Date: Sat, 11 May 2013 18:22:50 +0000
Subject: [PATCH] WHO PUTS UNITTESTS IN A TRY/EXCEPT BLOCK WHICH CATCHES ALL
 EXCEPTIONS?!

 * WHAT WAS THE POINT OF WRITING THE UNITTEST IF IT ALWAYS PASSES?
---
 gnupg/tests/test_gnupg.py | 42 ++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/gnupg/tests/test_gnupg.py b/gnupg/tests/test_gnupg.py
index 715172c..17068ab 100644
--- a/gnupg/tests/test_gnupg.py
+++ b/gnupg/tests/test_gnupg.py
@@ -732,29 +732,25 @@ be doing it in the first place. - Eric Schmidt, CEO of Google"""
         # On Windows, if the handles aren't closed, the files can't be deleted
         #os.close(encfno)
         #os.close(decfno)
-        try:
-            key = self.generate_key("Andrew Able", "alpha.com",
-                                    passphrase="andy")
-            andrew = key.fingerprint
-            key = self.generate_key("Barbara Brown", "beta.com")
-            barbara = key.fingerprint
-            data = "Hello, world!"
-            file = util._make_binary_stream(data, self.gpg.encoding)
-            edata = self.gpg.encrypt_file(file, barbara,
-                                          armor=False, output=encfname)
-            ddata = self.gpg.decrypt_file(efile, passphrase="bbrown",
-                                          output=decfname)
-            encfname.seek(0, 0) # can't use os.SEEK_SET in 2.4
-            edata = encfname.read()
-            ddata = decfname.read()
-            data = data.encode(self.gpg.encoding)
-            if ddata != data:
-                logger.debug("was: %r", data)
-                logger.debug("new: %r", ddata)
-            self.assertEqual(data, ddata, "Round-trip must work")
-        except Exception as exc:
-            logger.warn(exc.message)
-        logger.debug("test_file_encryption_and_decryption ends")
+        key = self.generate_key("Andrew Able", "alpha.com",
+                                passphrase="andy")
+        andrew = key.fingerprint
+        key = self.generate_key("Barbara Brown", "beta.com")
+        barbara = key.fingerprint
+        data = "Hello, world!"
+        file = util._make_binary_stream(data, self.gpg.encoding)
+        edata = self.gpg.encrypt_file(file, barbara,
+                                      armor=False, output=encfname)
+        ddata = self.gpg.decrypt_file(efile, passphrase="bbrown",
+                                      output=decfname)
+        encfname.seek(0, 0) # can't use os.SEEK_SET in 2.4
+        edata = encfname.read()
+        ddata = decfname.read()
+        data = data.encode(self.gpg.encoding)
+        if ddata != data:
+            logger.debug("was: %r", data)
+            logger.debug("new: %r", ddata)
+        self.assertEqual(data, ddata)
 
 
 suites = { 'parsers': set(['test_parsers_fix_unsafe',