From ce3c2f6beeae09d6c51bea3acbfb5be733a28a49 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Mon, 27 Dec 2010 01:51:19 +0100 Subject: [PATCH] test_update_maintainer.py: Use mox. --- debian/control | 1 + ubuntutools/test/test_update_maintainer.py | 19 +++++++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/debian/control b/debian/control index fa05060..2113287 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: dctrl-tools, python-gnupginterface, python-launchpadlib (>= 1.5.7), python-magic, + python-mox, python-setuptools, python-soappy, python-unittest2 diff --git a/ubuntutools/test/test_update_maintainer.py b/ubuntutools/test/test_update_maintainer.py index 1b5a1fb..b76d0ca 100644 --- a/ubuntutools/test/test_update_maintainer.py +++ b/ubuntutools/test/test_update_maintainer.py @@ -16,17 +16,17 @@ """Test suite for ubuntutools.update_maintainer""" +import __builtin__ import os import StringIO import sys +import mox + from ubuntutools.logger import Logger from ubuntutools.test import unittest from ubuntutools.update_maintainer import update_maintainer -import ubuntutools.control -import ubuntutools.update_maintainer - _LUCID_CHANGELOG = """axis2c (1.6.0-0ubuntu8) lucid; urgency=low * rebuild rest of main for armel armv7/thumb2 optimization; @@ -121,7 +121,7 @@ Package: xul-ext-adblock-plus """ #pylint: disable=R0904 -class UpdateMaintainerTestCase(unittest.TestCase): +class UpdateMaintainerTestCase(mox.MoxTestBase, unittest.TestCase): """TestCase object for ubuntutools.update_maintainer""" _directory = "/" @@ -150,18 +150,13 @@ class UpdateMaintainerTestCase(unittest.TestCase): #pylint: disable=C0103 def setUp(self): - ubuntutools.control.open = self._fake_open - ubuntutools.control.os.path.isfile = self._fake_isfile - ubuntutools.update_maintainer.open = self._fake_open - ubuntutools.update_maintainer.os.path.isfile = self._fake_isfile + super(UpdateMaintainerTestCase, self).setUp() + self.mox.stubs.Set(__builtin__, 'open', self._fake_open) + self.mox.stubs.Set(os.path, 'isfile', self._fake_isfile) Logger.stdout = StringIO.StringIO() Logger.stderr = StringIO.StringIO() def tearDown(self): - del ubuntutools.control.open - del ubuntutools.control.os.path.isfile - del ubuntutools.update_maintainer.open - del ubuntutools.update_maintainer.os.path.isfile self.assertEqual(Logger.stdout.getvalue(), '') self.assertEqual(Logger.stderr.getvalue(), '') self._files["changelog"] = None