Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

1 files changed, 6 insertions, 9 deletions

diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py
index 98f6a436..fe3088f8 100644
--- a/mediagoblin/tests/test_globals.py
+++ b/mediagoblin/tests/test_globals.py
@@ -14,32 +14,29 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from nose.tools import assert_raises
+import pytest
 
 from mediagoblin import mg_globals
 
+
 class TestGlobals(object):
-    def setUp(self):
-        self.old_connection = mg_globals.db_connection
+    def setup(self):
         self.old_database = mg_globals.database
 
-    def tearDown(self):
-        mg_globals.db_connection = self.old_connection
+    def teardown(self):
         mg_globals.database = self.old_database
 
     def test_setup_globals(self):
         mg_globals.setup_globals(
-            db_connection='my favorite db_connection!',
             database='my favorite database!',
             public_store='my favorite public_store!',
             queue_store='my favorite queue_store!')
 
-        assert mg_globals.db_connection == 'my favorite db_connection!'
         assert mg_globals.database == 'my favorite database!'
         assert mg_globals.public_store == 'my favorite public_store!'
         assert mg_globals.queue_store == 'my favorite queue_store!'
 
-        assert_raises(
+        pytest.raises(
             AssertionError,
             mg_globals.setup_globals,
-            no_such_global_foo = "Dummy")
+            no_such_global_foo="Dummy")