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

Merge pull request #261 from mmerickel/fix.remote-testing 

fix remote testing
This commit is contained in:
Joffrey F 2014-07-09 17:33:30 +02:00
parent 9170219188 e15b3bb689
commit 56e454f77b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/integration_test.py
View File

@ -17,6 +17,7 @@ import base64
import json import json
import io import io
import os import os
import shutil
import signal import signal
import tempfile import tempfile
import unittest import unittest
@ -27,15 +28,19 @@ import six
# FIXME: missing tests for # FIXME: missing tests for
# export; history; import_image; insert; port; push; tag; get; load # export; history; import_image; insert; port; push; tag; get; load
DEFAULT_BASE_URL = os.environ.get('DOCKER_HOST')
class BaseTestCase(unittest.TestCase): class BaseTestCase(unittest.TestCase):
tmp_imgs = [] tmp_imgs = []
tmp_containers = [] tmp_containers = []
tmp_folders = []
def setUp(self): def setUp(self):
self.client = docker.Client(timeout=5) self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=5)
self.tmp_imgs = [] self.tmp_imgs = []
self.tmp_containers = [] self.tmp_containers = []
self.tmp_folders = []
def tearDown(self): def tearDown(self):
for img in self.tmp_imgs: for img in self.tmp_imgs:
@ -49,6 +54,8 @@ class BaseTestCase(unittest.TestCase):
self.client.remove_container(container) self.client.remove_container(container)
except docker.errors.APIError: except docker.errors.APIError:
pass pass
for folder in self.tmp_folders:
shutil.rmtree(folder)
######################### #########################
# INFORMATION TESTS # # INFORMATION TESTS #
@ -108,7 +115,7 @@ class TestListContainers(BaseTestCase):
def runTest(self): def runTest(self):
res0 = self.client.containers(all=True) res0 = self.client.containers(all=True)
size = len(res0) size = len(res0)
res1 = self.client.create_container('busybox:latest', 'true;') res1 = self.client.create_container('busybox:latest', 'true')
self.assertIn('Id', res1) self.assertIn('Id', res1)
self.client.start(res1['Id']) self.client.start(res1['Id'])
self.tmp_containers.append(res1['Id']) self.tmp_containers.append(res1['Id'])
@ -118,7 +125,7 @@ class TestListContainers(BaseTestCase):
self.assertEqual(len(retrieved), 1) self.assertEqual(len(retrieved), 1)
retrieved = retrieved[0] retrieved = retrieved[0]
self.assertIn('Command', retrieved) self.assertIn('Command', retrieved)
self.assertEqual(retrieved['Command'], u'true;') self.assertEqual(retrieved['Command'], u'true')
self.assertIn('Image', retrieved) self.assertIn('Image', retrieved)
self.assertRegexpMatches(retrieved['Image'], r'busybox:.*') self.assertRegexpMatches(retrieved['Image'], r'busybox:.*')
self.assertIn('Status', retrieved) self.assertIn('Status', retrieved)
@ -138,7 +145,8 @@ class TestCreateContainer(BaseTestCase):
class TestCreateContainerWithBinds(BaseTestCase): class TestCreateContainerWithBinds(BaseTestCase):
def runTest(self): def runTest(self):
mount_dest = '/mnt' mount_dest = '/mnt'
mount_origin = '/tmp' mount_origin = tempfile.mkdtemp()
self.tmp_folders.append(mount_origin)
filename = 'shared.txt' filename = 'shared.txt'
shared_file = os.path.join(mount_origin, filename) shared_file = os.path.join(mount_origin, filename)
@ -850,6 +858,7 @@ class TestRunShlex(BaseTestCase):
class TestLoadConfig(BaseTestCase): class TestLoadConfig(BaseTestCase):
def runTest(self): def runTest(self):
folder = tempfile.mkdtemp() folder = tempfile.mkdtemp()
self.tmp_folders.append(folder)
f = open(os.path.join(folder, '.dockercfg'), 'w') f = open(os.path.join(folder, '.dockercfg'), 'w')
auth_ = base64.b64encode(b'sakuya:izayoi').decode('ascii') auth_ = base64.b64encode(b'sakuya:izayoi').decode('ascii')
f.write('auth = {0}\n'.format(auth_)) f.write('auth = {0}\n'.format(auth_))
@ -867,6 +876,7 @@ class TestLoadConfig(BaseTestCase):
class TestLoadJSONConfig(BaseTestCase): class TestLoadJSONConfig(BaseTestCase):
def runTest(self): def runTest(self):
folder = tempfile.mkdtemp() folder = tempfile.mkdtemp()
self.tmp_folders.append(folder)
f = open(os.path.join(folder, '.dockercfg'), 'w') f = open(os.path.join(folder, '.dockercfg'), 'w')
auth_ = base64.b64encode(b'sakuya:izayoi').decode('ascii') auth_ = base64.b64encode(b'sakuya:izayoi').decode('ascii')
email_ = 'sakuya@scarlet.net' email_ = 'sakuya@scarlet.net'
@ -902,6 +912,6 @@ class TestConnectionTimeout(unittest.TestCase):
if __name__ == '__main__': if __name__ == '__main__':
c = docker.Client() c = docker.Client(base_url=DEFAULT_BASE_URL)
c.pull('busybox') c.pull('busybox')
unittest.main() unittest.main()