jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #439 from dnephin/faster_integration_tests

Browse source 
Faster integration testing
This commit is contained in:
Aanand Prasad 2014-09-24 17:34:52 -07:00
commit d978787fcc
3 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/integration/testcases.py
View file

@ -10,7 +10,6 @@ class DockerClientTestCase(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.client = Client(docker_url())
cls.client.pull('busybox', tag='latest')
def setUp(self):
for c in self.client.containers(all=True):

28
tests/unit/service_test.py
View file

@ -17,6 +17,10 @@ from fig.service import (
class ServiceTest(unittest.TestCase):
def setUp(self):
self.mock_client = mock.create_autospec(docker.Client)
def test_name_validations(self):
self.assertRaises(ConfigError, lambda: Service(name=''))
@ -70,29 +74,27 @@ class ServiceTest(unittest.TestCase):
split_port("0.0.0.0:1000:2000:tcp")
def test_split_domainname_none(self):
service = Service('foo',
hostname = 'name',
)
service.next_container_name = lambda x: 'foo'
service = Service('foo', hostname='name', client=self.mock_client)
self.mock_client.containers.return_value = []
opts = service._get_container_create_options({})
self.assertEqual(opts['hostname'], 'name', 'hostname')
self.assertFalse('domainname' in opts, 'domainname')
def test_split_domainname_fqdn(self):
service = Service('foo',
hostname = 'name.domain.tld',
)
service.next_container_name = lambda x: 'foo'
hostname='name.domain.tld',
client=self.mock_client)
self.mock_client.containers.return_value = []
opts = service._get_container_create_options({})
self.assertEqual(opts['hostname'], 'name', 'hostname')
self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
def test_split_domainname_both(self):
service = Service('foo',
hostname = 'name',
domainname = 'domain.tld',
)
service.next_container_name = lambda x: 'foo'
hostname='name',
domainname='domain.tld',
client=self.mock_client)
self.mock_client.containers.return_value = []
opts = service._get_container_create_options({})
self.assertEqual(opts['hostname'], 'name', 'hostname')
self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
@ -101,8 +103,8 @@ class ServiceTest(unittest.TestCase):
service = Service('foo',
hostname='name.sub',
domainname='domain.tld',
)
service.next_container_name = lambda x: 'foo'
client=self.mock_client)
self.mock_client.containers.return_value = []
opts = service._get_container_create_options({})
self.assertEqual(opts['hostname'], 'name.sub', 'hostname')
self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')