docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganise tests

This commit is contained in:
Ben Firshman 2013-12-10 20:47:08 +00:00
parent 3a3767f59d
commit b59436742b
3 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plum/tests/service_collection_test.py
View File

@ -1,9 +1,9 @@
from plum.service import Service from plum.service import Service
from plum.service_collection import ServiceCollection from plum.service_collection import ServiceCollection
from .testcases import ServiceTestCase from .testcases import DockerClientTestCase
class ServiceCollectionTest(ServiceTestCase): class ServiceCollectionTest(DockerClientTestCase):
def test_from_dict(self): def test_from_dict(self):
collection = ServiceCollection.from_dicts(None, [ collection = ServiceCollection.from_dicts(None, [
{ {

41
plum/tests/service_test.py
View File

@ -1,8 +1,8 @@
from plum import Service from plum import Service
from .testcases import ServiceTestCase from .testcases import DockerClientTestCase
class NameTestCase(ServiceTestCase): class NameTestCase(DockerClientTestCase):
def test_name_validations(self): def test_name_validations(self):
self.assertRaises(ValueError, lambda: Service(name='')) self.assertRaises(ValueError, lambda: Service(name=''))
@ -18,8 +18,6 @@ class NameTestCase(ServiceTestCase):
Service('_') Service('_')
Service('_____') Service('_____')
class ContainersTestCase(ServiceTestCase):
def test_containers(self): def test_containers(self):
foo = self.create_service('foo') foo = self.create_service('foo')
bar = self.create_service('bar') bar = self.create_service('bar')
@ -39,35 +37,28 @@ class ContainersTestCase(ServiceTestCase):
self.assertIn(['/bar_1'], names) self.assertIn(['/bar_1'], names)
self.assertIn(['/bar_2'], names) self.assertIn(['/bar_2'], names)
class ScalingTestCase(ServiceTestCase):
def setUp(self):
super(ServiceTestCase, self).setUp()
self.service = self.create_service("scaling_test")
def test_up_scale_down(self): def test_up_scale_down(self):
self.assertEqual(len(self.service.containers), 0) service = self.create_service('scaling_test')
self.assertEqual(len(service.containers), 0)
self.service.start() service.start()
self.assertEqual(len(self.service.containers), 1) self.assertEqual(len(service.containers), 1)
self.service.start() service.start()
self.assertEqual(len(self.service.containers), 1) self.assertEqual(len(service.containers), 1)
self.service.scale(2) service.scale(2)
self.assertEqual(len(self.service.containers), 2) self.assertEqual(len(service.containers), 2)
self.service.scale(1) service.scale(1)
self.assertEqual(len(self.service.containers), 1) self.assertEqual(len(service.containers), 1)
self.service.stop() service.stop()
self.assertEqual(len(self.service.containers), 0) self.assertEqual(len(service.containers), 0)
self.service.stop() service.stop()
self.assertEqual(len(self.service.containers), 0) self.assertEqual(len(service.containers), 0)
class LinksTestCase(ServiceTestCase):
def test_links_are_created_when_starting(self): def test_links_are_created_when_starting(self):
db = self.create_service('db') db = self.create_service('db')
web = self.create_service('web', links=[db]) web = self.create_service('web', links=[db])

2
plum/tests/testcases.py
View File

@ -4,7 +4,7 @@ import os
from unittest import TestCase from unittest import TestCase
class ServiceTestCase(TestCase): class DockerClientTestCase(TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
if os.environ.get('DOCKER_URL'): if os.environ.get('DOCKER_URL'):