Apply package rename to tests

pull/35/head
David Wilson 7 years ago
parent 583b7b59e2
commit 10c0dca24c

@ -2,7 +2,7 @@
I am a self-contained program!
"""
import econtext.master
import mitogen.master
def repr_stuff():
@ -10,13 +10,13 @@ def repr_stuff():
def main():
broker = econtext.master.Broker()
broker = mitogen.master.Broker()
try:
context = econtext.master.connect(broker)
context = mitogen.master.connect(broker)
print context.call(repr_stuff)
finally:
broker.shutdown()
broker.join()
if __name__ == '__main__' and not econtext.slave:
if __name__ == '__main__' and not mitogen.slave:
main()

@ -2,9 +2,9 @@
import os
import sys
import econtext
import econtext.master
import econtext.utils
import mitogen
import mitogen.master
import mitogen.utils
import sys
@ -27,11 +27,11 @@ def serve_django_app(settings_name):
def main(broker):
import logging
econtext.utils.log_to_file(level=logging.INFO, io=False)
context = econtext.master.connect(broker)
mitogen.utils.log_to_file(level=logging.INFO, io=False)
context = mitogen.master.connect(broker)
context.call(os.chdir, '/')
#context.call(econtext.utils.log_to_file, '/tmp/log')
#context.call(mitogen.utils.log_to_file, '/tmp/log')
context.call(serve_django_app, 'webproject.settings')
if __name__ == '__main__' and not econtext.slave:
econtext.utils.run_with_broker(main)
if __name__ == '__main__' and not mitogen.slave:
mitogen.utils.run_with_broker(main)

@ -8,7 +8,7 @@ import zlib
import mock
import pytest
import econtext.core
import mitogen.core
import testlib
@ -18,7 +18,7 @@ class ImporterMixin(object):
def setUp(self):
super(ImporterMixin, self).setUp()
self.context = mock.Mock()
self.importer = econtext.core.Importer(self.context)
self.importer = mitogen.core.Importer(self.context)
def tearDown(self):
sys.modules.pop(self.modname, None)

@ -4,7 +4,7 @@ import subprocess
import unittest
import sys
import econtext.master
import mitogen.master
import testlib
import plain_old_module
@ -15,13 +15,13 @@ class GoodModulesTest(testlib.BrokerMixin, unittest.TestCase):
def test_plain_old_module(self):
# The simplest case: a top-level module with no interesting imports or
# package machinery damage.
context = econtext.master.connect(self.broker)
context = mitogen.master.connect(self.broker)
self.assertEquals(256, context.call(plain_old_module.pow, 2, 8))
def test_simple_pkg(self):
# Ensure success of a simple package containing two submodules, one of
# which imports the other.
context = econtext.master.connect(self.broker)
context = mitogen.master.connect(self.broker)
self.assertEquals(3,
context.call(simple_pkg.a.subtract_one_add_two, 2))
@ -39,7 +39,7 @@ class BrokenModulesTest(unittest.TestCase):
# unavailable. Should never happen in the real world.
context = mock.Mock()
responder = econtext.master.ModuleResponder(context)
responder = mitogen.master.ModuleResponder(context)
responder.get_module((50, 'non_existent_module'))
self.assertEquals(1, len(context.enqueue.mock_calls))
@ -57,7 +57,7 @@ class BrokenModulesTest(unittest.TestCase):
import six_brokenpkg
context = mock.Mock()
responder = econtext.master.ModuleResponder(context)
responder = mitogen.master.ModuleResponder(context)
responder.get_module((50, 'six_brokenpkg._six'))
self.assertEquals(1, len(context.enqueue.mock_calls))

@ -1,10 +1,10 @@
import unittest
import econtext
import econtext.master
import econtext.ssh
import econtext.utils
import mitogen
import mitogen.master
import mitogen.ssh
import mitogen.utils
import testlib
@ -15,11 +15,11 @@ def add(x, y):
class SshTest(unittest.TestCase):
def test_okay(self):
@econtext.utils.run_with_broker
@mitogen.utils.run_with_broker
def test(broker):
context = econtext.ssh.connect(broker,
context = mitogen.ssh.connect(broker,
hostname='hostname',
ssh_path=testlib.data_path('fakessh.py'))
context.call(econtext.utils.log_to_file, '/tmp/log')
context.call(econtext.utils.disable_site_packages)
context.call(mitogen.utils.log_to_file, '/tmp/log')
context.call(mitogen.utils.disable_site_packages)
self.assertEquals(3, context.call(add, 1, 2))

@ -5,7 +5,7 @@ import unittest
import mock
import econtext.master
import mitogen.master
DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
@ -14,7 +14,7 @@ sys.path.append(DATA_DIR)
def set_debug():
import logging
logging.getLogger('econtext').setLevel(logging.DEBUG)
logging.getLogger('mitogen').setLevel(logging.DEBUG)
def data_path(suffix):
@ -22,7 +22,7 @@ def data_path(suffix):
class BrokerMixin(object):
broker_class = econtext.master.Broker
broker_class = mitogen.master.Broker
def setUp(self):
super(BrokerMixin, self).setUp()

@ -4,13 +4,13 @@ import socket
import time
import unittest
import econtext.master
import econtext.utils
import mitogen.master
import mitogen.utils
@econtext.utils.with_broker
@mitogen.utils.with_broker
def do_stuff(broker):
context = econtext.master.connect(broker)
context = mitogen.master.connect(broker)
t0 = time.time()
ncalls = 1000
for x in xrange(ncalls):

@ -2,15 +2,15 @@
import unittest
import econtext.master
import econtext.utils
import mitogen.master
import mitogen.utils
def func0(broker):
return broker
@econtext.utils.with_broker
@mitogen.utils.with_broker
def func(broker):
return broker
@ -20,13 +20,13 @@ class RunWithBrokerTest(unittest.TestCase):
# test_shutdown_on_success
def test_run_with_broker(self):
broker = econtext.utils.run_with_broker(func0)
self.assertTrue(isinstance(broker, econtext.master.Broker))
broker = mitogen.utils.run_with_broker(func0)
self.assertTrue(isinstance(broker, mitogen.master.Broker))
self.assertFalse(broker._thread.isAlive())
class WithBrokerTest(unittest.TestCase):
def test_with_broker(self):
broker = func()
self.assertTrue(isinstance(broker, econtext.master.Broker))
self.assertTrue(isinstance(broker, mitogen.master.Broker))
self.assertFalse(broker._thread.isAlive())

Loading…
Cancel
Save