Fix up a few more ssh_tests, stop sending 400 modules over network.

Defining functions in the current module was causing the entirety of
py.test and all dependencies to be sucked in.
pull/35/head
David Wilson 7 years ago
parent cffaa92fc4
commit bd2c613b9c

@ -6,5 +6,14 @@ fiddlery.
import math
def get_sentinel_value():
# Some proof we're even talking to the mitogen-test Docker image
return file('/etc/sentinel').read()
def add(x, y):
return x + y
def pow(x, y):
return x ** y

@ -2,31 +2,23 @@
import unittest
import mitogen
import mitogen.master
import mitogen.ssh
import mitogen.utils
import testlib
import plain_old_module
def add(x, y):
return x + y
def get_sentinel_value():
# Some proof we're even talking to the mitogen-test Docker image
return file('/etc/sentinel').read()
class FakeSshTest(testlib.RouterMixin):
def test_okay(router, self):
def test(broker):
context = mitogen.ssh.connect(broker,
class FakeSshTest(testlib.RouterMixin, unittest.TestCase):
def test_okay(self):
context = self.router.ssh(
hostname='hostname',
ssh_path=testlib.data_path('fakessh.py'))
context.call(mitogen.utils.log_to_file, '/tmp/log')
context.call(mitogen.utils.disable_site_packages)
self.assertEquals(3, context.call(add, 1, 2))
username='has-sudo',
ssh_path=testlib.data_path('fakessh.py'),
)
#context.call(mitogen.utils.log_to_file, '/tmp/log')
#context.call(mitogen.utils.disable_site_packages)
self.assertEquals(3, context.call(plain_old_module.add, 1, 2))
class SshTest(testlib.DockerMixin, unittest.TestCase):
@ -71,7 +63,7 @@ class SshTest(testlib.DockerMixin, unittest.TestCase):
)
sentinel = 'i-am-mitogen-test-docker-image\n'
assert sentinel == context.call(get_sentinel_value)
assert sentinel == context.call(plain_old_module.get_sentinel_value)
def test_pubkey_required(self):
try:
@ -88,16 +80,13 @@ class SshTest(testlib.DockerMixin, unittest.TestCase):
assert e[0] == self.stream_class.password_required_msg
def test_pubkey_specified(self):
try:
context = self.router.ssh(
hostname=self.dockerized_ssh.host,
port=self.dockerized_ssh.port,
check_host_keys=False,
username='has-sudo-pubkey',
identity_file=testlib.data_path('docker/has-sudo-pubkey.key'),
)
assert 0, 'exception not thrown'
except mitogen.ssh.PasswordError, e:
pass
context = self.router.ssh(
hostname=self.dockerized_ssh.host,
port=self.dockerized_ssh.port,
check_host_keys=False,
username='has-sudo-pubkey',
identity_file=testlib.data_path('docker/has-sudo-pubkey.key'),
)
assert e[0] == self.stream_class.password_required_msg
sentinel = 'i-am-mitogen-test-docker-image\n'
assert sentinel == context.call(plain_old_module.get_sentinel_value)

Loading…
Cancel
Save