removed more context managers

2 files changed, 53 insertions, 4 deletions

diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py
index 20dae083e..d0e840999 100644
--- a/testsuite/Testlib/TestServer/TestPlugin.py
+++ b/testsuite/Testlib/TestServer/TestPlugin.py
@@ -1,5 +1,6 @@
 import os
 import re
+import sys
 import copy
 import logging
 import lxml.etree
@@ -506,8 +507,19 @@ class TestDirectoryBacked(Bcfg2TestCase):
         db.entries.update(dict(a=1, b=2, c=3))
         self.assertEqual(db['a'], 1)
         self.assertEqual(db['b'], 2)
-        with self.assertRaises(KeyError):
+        expected = KeyError
+        try:
             db['d']
+        except expected:
+            pass
+        except:
+            err = sys.exc_info()[1]
+            self.assertFalse(True, "%s raised instead of %s" %
+                             (err.__class__.__name__,
+                              expected.__class__.__name__))
+        else:
+            self.assertFalse(True,
+                             "%s not raised" % expected.__class__.__name__)
 
     def test__iter(self):
         db = self.get_obj()
diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
index 5dcd84a0c..4e9c66ee5 100644
--- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -144,8 +144,19 @@ class TestClientVersions(Bcfg2TestCase):
         self.assertIsNone(v['client5'])
 
         # test exception on nonexistent client
-        with self.assertRaises(KeyError):
+        expected = KeyError
+        try:
             v['clients__getitem']
+        except expected:
+            pass
+        except:
+            err = sys.exc_info()[1]
+            self.assertFalse(True, "%s raised instead of %s" %
+                             (err.__class__.__name__,
+                              expected.__class__.__name__))
+        else:
+            self.assertFalse(True,
+                             "%s not raised" % expected.__class__.__name__)
 
     def test__len(self):
         v = ClientVersions()
@@ -182,16 +193,42 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
 
     def test_xdata(self):
         config = self.get_obj()
-        with self.assertRaises(Bcfg2.Server.Plugin.MetadataRuntimeError):
+        expected = Bcfg2.Server.Plugin.MetadataRuntimeError
+        try:
             config.xdata
+        except expected:
+            pass
+        except:
+            err = sys.exc_info()[1]
+            self.assertFalse(True, "%s raised instead of %s" %
+                             (err.__class__.__name__,
+                              expected.__class__.__name__))
+        else:
+            self.assertFalse(True,
+                             "%s not raised" % expected.__class__.__name__)
+            pass
+
         config.data = "<test/>"
         self.assertEqual(config.xdata, "<test/>")
 
     def test_base_xdata(self):
         config = self.get_obj()
         # we can't use assertRaises here because base_xdata is a property
-        with self.assertRaises(Bcfg2.Server.Plugin.MetadataRuntimeError):
+        expected = Bcfg2.Server.Plugin.MetadataRuntimeError
+        try:
             config.base_xdata
+        except expected:
+            pass
+        except:
+            err = sys.exc_info()[1]
+            self.assertFalse(True, "%s raised instead of %s" %
+                             (err.__class__.__name__,
+                              expected.__class__.__name__))
+        else:
+            self.assertFalse(True,
+                             "%s not raised" % expected.__class__.__name__)
+            pass
+
         config.basedata = "<test/>"
         self.assertEqual(config.base_xdata, "<test/>")