Extract docker URL logic, use it in tests as well
This commit is contained in:
parent
ff65a3e1b0
commit
9ed6538693
4 changed files with 32 additions and 32 deletions
|
|
@ -1,5 +1,4 @@
|
|||
from fig.project import Project
|
||||
from fig.service import Service
|
||||
from .testcases import DockerClientTestCase
|
||||
|
||||
|
||||
|
|
@ -57,7 +56,7 @@ class ProjectTest(DockerClientTestCase):
|
|||
self.assertEqual(len(unstarted), 2)
|
||||
self.assertEqual(unstarted[0][0], web)
|
||||
self.assertEqual(unstarted[1][0], db)
|
||||
self.assertEqual(len(web.containers(stopped=True)), 2)
|
||||
self.assertEqual(len(web.containers(stopped=True)), 1)
|
||||
self.assertEqual(len(db.containers(stopped=True)), 1)
|
||||
|
||||
def test_up(self):
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
from docker import Client
|
||||
from fig.service import Service
|
||||
import os
|
||||
from fig.cli.utils import docker_url
|
||||
from unittest import TestCase
|
||||
|
||||
|
||||
class DockerClientTestCase(TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
if os.environ.get('DOCKER_URL'):
|
||||
cls.client = Client(os.environ['DOCKER_URL'])
|
||||
else:
|
||||
cls.client = Client()
|
||||
cls.client = Client(docker_url())
|
||||
cls.client.pull('ubuntu')
|
||||
|
||||
def setUp(self):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue