Dropping mox

This commit is contained in:
Dimitri John Ledkov 2014-12-15 03:25:41 +00:00
parent a46a78b97f
commit 7d70b6b3a3
3 changed files with 28 additions and 18 deletions

View File

@ -20,12 +20,14 @@ import __builtin__
import os.path import os.path
import shutil import shutil
import StringIO import StringIO
from io import BytesIO
import tempfile import tempfile
import types import types
import urllib2 import urllib2
import debian.deb822 import debian.deb822
import httplib2 import httplib2
import mock
import mox import mox
import ubuntutools.archive import ubuntutools.archive
@ -44,15 +46,11 @@ def setUpModule():
ex_pkg.cleanup() ex_pkg.cleanup()
class DscVerificationTestCase(mox.MoxTestBase, unittest.TestCase): class DscVerificationTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
super(DscVerificationTestCase, self).setUp()
with open('test-data/example_1.0-1.dsc', 'rb') as f: with open('test-data/example_1.0-1.dsc', 'rb') as f:
self.dsc = ubuntutools.archive.Dsc(f.read()) self.dsc = ubuntutools.archive.Dsc(f.read())
def tearDown(self):
super(DscVerificationTestCase, self).tearDown()
def test_good(self): def test_good(self):
self.assertTrue(self.dsc.verify_file( self.assertTrue(self.dsc.verify_file(
'test-data/example_1.0.orig.tar.gz')) 'test-data/example_1.0.orig.tar.gz'))
@ -68,10 +66,10 @@ class DscVerificationTestCase(mox.MoxTestBase, unittest.TestCase):
with open(fn, 'rb') as f: with open(fn, 'rb') as f:
data = f.read() data = f.read()
data = data[:-1] + chr(ord(data[-1]) ^ 8) data = data[:-1] + chr(ord(data[-1]) ^ 8)
self.mox.StubOutWithMock(__builtin__, 'open') m = mock.MagicMock(name='open', spec=open)
open(fn, 'rb').AndReturn(StringIO.StringIO(data)) m.return_value = BytesIO(data)
self.mox.ReplayAll() with mock.patch('__builtin__.open', m):
self.assertFalse(self.dsc.verify_file(fn)) self.assertFalse(self.dsc.verify_file(fn))
def test_sha1(self): def test_sha1(self):
del self.dsc['Checksums-Sha256'] del self.dsc['Checksums-Sha256']

View File

@ -19,15 +19,16 @@ import __builtin__
import os import os
import sys import sys
import locale import locale
from io import BytesIO
from StringIO import StringIO from StringIO import StringIO
import mox import mock
from ubuntutools.config import UDTConfig, ubu_email from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.test import unittest from ubuntutools.test import unittest
class ConfigTestCase(mox.MoxTestBase, unittest.TestCase): class ConfigTestCase(unittest.TestCase):
_config_files = { _config_files = {
'system': '', 'system': '',
'user': '', 'user': '',
@ -42,11 +43,16 @@ class ConfigTestCase(mox.MoxTestBase, unittest.TestCase):
} }
if filename not in files: if filename not in files:
raise IOError("No such file or directory: '%s'" % filename) raise IOError("No such file or directory: '%s'" % filename)
return StringIO(files[filename]) return BytesIO(files[filename])
def setUp(self): def setUp(self):
super(ConfigTestCase, self).setUp() super(ConfigTestCase, self).setUp()
self.mox.stubs.Set(__builtin__, 'open', self._fake_open) m = mock.mock_open()
m.side_effect = self._fake_open
patcher = mock.patch('__builtin__.open', m)
self.addCleanup(patcher.stop)
self.MockOpen = self.patcher.start()
Logger.stdout = StringIO() Logger.stdout = StringIO()
Logger.stderr = StringIO() Logger.stderr = StringIO()

View File

@ -21,7 +21,7 @@ import os
import StringIO import StringIO
import sys import sys
import mox import mock
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.test import unittest from ubuntutools.test import unittest
@ -186,7 +186,7 @@ Package: seahorse-plugins
""" """
#pylint: disable=R0904 #pylint: disable=R0904
class UpdateMaintainerTestCase(mox.MoxTestBase, unittest.TestCase): class UpdateMaintainerTestCase(unittest.TestCase):
"""TestCase object for ubuntutools.update_maintainer""" """TestCase object for ubuntutools.update_maintainer"""
_directory = "/" _directory = "/"
@ -216,9 +216,15 @@ class UpdateMaintainerTestCase(mox.MoxTestBase, unittest.TestCase):
#pylint: disable=C0103 #pylint: disable=C0103
def setUp(self): def setUp(self):
super(UpdateMaintainerTestCase, self).setUp() m = mock.mock_open()
self.mox.stubs.Set(__builtin__, 'open', self._fake_open) m.side_effect = self._fake_open
self.mox.stubs.Set(os.path, 'isfile', self._fake_isfile) patcher = mock.patch('__builtin__.open', m)
self.addCleanup(patcher.stop)
self.MockOpen = patcher.start()
m = mock.MagicMock(side_effect=self._fake_isfile)
patcher = mock.patch('os.path.isfile', m)
self.addCleanup(patcher.stop)
self.MockIsfile = patcher.start()
self._files["rules"] = StringIO.StringIO(_SIMPLE_RULES) self._files["rules"] = StringIO.StringIO(_SIMPLE_RULES)
Logger.stdout = StringIO.StringIO() Logger.stdout = StringIO.StringIO()
Logger.stderr = StringIO.StringIO() Logger.stderr = StringIO.StringIO()