Skip to content

D
docker-py
Kaydet (Commit) 1ca2bc58 authored tarafından Joffrey F's avatar Joffrey F
Dosyalara gözat
Seçenekler

Merge pull request #855 from docker/852-independent-integration 

Move methods/classes used by all integration tests to helpers.py
üst e1eefce7 73b51400
Show whitespace changes
Inline Side-by-side
Showing with 182 additions and 181 deletions
Makefile
Dosyayı görüntüle @ 1ca2bc58
...@@ -39,8 +39,8 @@ integration-dind: build build-py3 ...@@ -39,8 +39,8 @@ integration-dind: build build-py3
integration-dind-ssl: build-dind-certs build build-py3 integration-dind-ssl: build-dind-certs build build-py3
docker run -d --name dpy-dind-certs dpy-dind-certs docker run -d --name dpy-dind-certs dpy-dind-certs
docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl -v /tmp --privileged dockerswarm/dind:1.9.0 docker daemon --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl -v /tmp --privileged dockerswarm/dind:1.9.0 docker daemon --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375
docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py py.test tests/integration_test.py docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py py.test tests/integration
docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py3 py.test tests/integration_test.py docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py3 py.test tests/integration
docker rm -vf dpy-dind-ssl dpy-dind-certs docker rm -vf dpy-dind-ssl dpy-dind-certs
flake8: build flake8: build
......
tests/helpers.py
Dosyayı görüntüle @ 1ca2bc58
import os import os
import os.path import os.path
import shutil
import tarfile import tarfile
import tempfile import tempfile
import unittest
import docker
import six
BUSYBOX = 'busybox:buildroot-2014.02'
EXEC_DRIVER = []
def make_tree(dirs, files): def make_tree(dirs, files):
...@@ -35,3 +43,82 @@ def untar_file(tardata, filename): ...@@ -35,3 +43,82 @@ def untar_file(tardata, filename):
result = f.read() result = f.read()
f.close() f.close()
return result return result
def exec_driver_is_native():
global EXEC_DRIVER
if not EXEC_DRIVER:
c = docker_client()
EXEC_DRIVER = c.info()['ExecutionDriver']
c.close()
return EXEC_DRIVER.startswith('native')
def docker_client(**kwargs):
return docker.Client(**docker_client_kwargs(**kwargs))
def docker_client_kwargs(**kwargs):
client_kwargs = docker.utils.kwargs_from_env(assert_hostname=False)
client_kwargs.update(kwargs)
return client_kwargs
class BaseTestCase(unittest.TestCase):
tmp_imgs = []
tmp_containers = []
tmp_folders = []
tmp_volumes = []
def setUp(self):
if six.PY2:
self.assertRegex = self.assertRegexpMatches
self.assertCountEqual = self.assertItemsEqual
self.client = docker_client(timeout=60)
self.tmp_imgs = []
self.tmp_containers = []
self.tmp_folders = []
self.tmp_volumes = []
self.tmp_networks = []
def tearDown(self):
for img in self.tmp_imgs:
try:
self.client.remove_image(img)
except docker.errors.APIError:
pass
for container in self.tmp_containers:
try:
self.client.stop(container, timeout=1)
self.client.remove_container(container)
except docker.errors.APIError:
pass
for network in self.tmp_networks:
try:
self.client.remove_network(network)
except docker.errors.APIError:
pass
for folder in self.tmp_folders:
shutil.rmtree(folder)
for volume in self.tmp_volumes:
try:
self.client.remove_volume(volume)
except docker.errors.APIError:
pass
self.client.close()
def run_container(self, *args, **kwargs):
container = self.client.create_container(*args, **kwargs)
self.tmp_containers.append(container)
self.client.start(container)
exitcode = self.client.wait(container)
if exitcode != 0:
output = self.client.logs(container)
raise Exception(
"Container exited with code {}:\n{}"
.format(exitcode, output))
return container
tests/integration/api_test.py
Dosyayı görüntüle @ 1ca2bc58
import base64 import base64
import json
import os import os
import shutil
import tempfile import tempfile
import time import time
import unittest import unittest
import warnings import warnings
import docker import docker
import six
BUSYBOX = 'busybox:buildroot-2014.02' from .. import helpers
EXEC_DRIVER = []
def exec_driver_is_native(): class InformationTest(helpers.BaseTestCase):
global EXEC_DRIVER
if not EXEC_DRIVER:
c = docker_client()
EXEC_DRIVER = c.info()['ExecutionDriver']
c.close()
return EXEC_DRIVER.startswith('native')
def docker_client(**kwargs):
return docker.Client(**docker_client_kwargs(**kwargs))
def docker_client_kwargs(**kwargs):
client_kwargs = docker.utils.kwargs_from_env(assert_hostname=False)
client_kwargs.update(kwargs)
return client_kwargs
def setup_module():
warnings.simplefilter('error')
c = docker_client()
try:
c.inspect_image(BUSYBOX)
except docker.errors.NotFound:
os.write(2, "\npulling busybox\n".encode('utf-8'))
for data in c.pull(BUSYBOX, stream=True):
data = json.loads(data.decode('utf-8'))
os.write(2, ("%c[2K\r" % 27).encode('utf-8'))
status = data.get("status")
progress = data.get("progress")
detail = "{0} - {1}".format(status, progress).encode('utf-8')
os.write(2, detail)
os.write(2, "\npulled busybox\n".encode('utf-8'))
# Double make sure we now have busybox
c.inspect_image(BUSYBOX)
c.close()
class BaseTestCase(unittest.TestCase):
tmp_imgs = []
tmp_containers = []
tmp_folders = []
tmp_volumes = []
def setUp(self):
if six.PY2:
self.assertRegex = self.assertRegexpMatches
self.assertCountEqual = self.assertItemsEqual
self.client = docker_client(timeout=60)
self.tmp_imgs = []
self.tmp_containers = []
self.tmp_folders = []
self.tmp_volumes = []
self.tmp_networks = []
def tearDown(self):
for img in self.tmp_imgs:
try:
self.client.remove_image(img)
except docker.errors.APIError:
pass
for container in self.tmp_containers:
try:
self.client.stop(container, timeout=1)
self.client.remove_container(container)
except docker.errors.APIError:
pass
for network in self.tmp_networks:
try:
self.client.remove_network(network)
except docker.errors.APIError:
pass
for folder in self.tmp_folders:
shutil.rmtree(folder)
for volume in self.tmp_volumes:
try:
self.client.remove_volume(volume)
except docker.errors.APIError:
pass
self.client.close()
def run_container(self, *args, **kwargs):
container = self.client.create_container(*args, **kwargs)
self.tmp_containers.append(container)
self.client.start(container)
exitcode = self.client.wait(container)
if exitcode != 0:
output = self.client.logs(container)
raise Exception(
"Container exited with code {}:\n{}"
.format(exitcode, output))
return container
#########################
# INFORMATION TESTS #
#########################
class InformationTest(BaseTestCase):
def test_version(self): def test_version(self):
res = self.client.version() res = self.client.version()
self.assertIn('GoVersion', res) self.assertIn('GoVersion', res)
...@@ -133,7 +24,7 @@ class InformationTest(BaseTestCase): ...@@ -133,7 +24,7 @@ class InformationTest(BaseTestCase):
self.assertIn('Debug', res) self.assertIn('Debug', res)
def test_search(self): def test_search(self):
self.client = docker_client(timeout=10) self.client = helpers.docker_client(timeout=10)
res = self.client.search('busybox') res = self.client.search('busybox')
self.assertTrue(len(res) >= 1) self.assertTrue(len(res) >= 1)
base_img = [x for x in res if x['name'] == 'busybox'] base_img = [x for x in res if x['name'] == 'busybox']
...@@ -141,16 +32,11 @@ class InformationTest(BaseTestCase): ...@@ -141,16 +32,11 @@ class InformationTest(BaseTestCase):
self.assertIn('description', base_img[0]) self.assertIn('description', base_img[0])
################# class LinkTest(helpers.BaseTestCase):
# LINKS TESTS #
#################
class LinkTest(BaseTestCase):
def test_remove_link(self): def test_remove_link(self):
# Create containers # Create containers
container1 = self.client.create_container( container1 = self.client.create_container(
BUSYBOX, 'cat', detach=True, stdin_open=True helpers.BUSYBOX, 'cat', detach=True, stdin_open=True
) )
container1_id = container1['Id'] container1_id = container1['Id']
self.tmp_containers.append(container1_id) self.tmp_containers.append(container1_id)
...@@ -162,7 +48,7 @@ class LinkTest(BaseTestCase): ...@@ -162,7 +48,7 @@ class LinkTest(BaseTestCase):
link_alias = 'mylink' link_alias = 'mylink'
container2 = self.client.create_container( container2 = self.client.create_container(
BUSYBOX, 'cat', host_config=self.client.create_host_config( helpers.BUSYBOX, 'cat', host_config=self.client.create_host_config(
links={link_path: link_alias}, network_mode='none' links={link_path: link_alias}, network_mode='none'
) )
) )
...@@ -188,11 +74,7 @@ class LinkTest(BaseTestCase): ...@@ -188,11 +74,7 @@ class LinkTest(BaseTestCase):
self.assertEqual(len(retrieved), 2) self.assertEqual(len(retrieved), 2)
####################### class LoadConfigTest(helpers.BaseTestCase):
# PY SPECIFIC TESTS #
#######################
class LoadConfigTest(BaseTestCase):
def test_load_legacy_config(self): def test_load_legacy_config(self):
folder = tempfile.mkdtemp() folder = tempfile.mkdtemp()
self.tmp_folders.append(folder) self.tmp_folders.append(folder)
...@@ -231,7 +113,7 @@ class LoadConfigTest(BaseTestCase): ...@@ -231,7 +113,7 @@ class LoadConfigTest(BaseTestCase):
class AutoDetectVersionTest(unittest.TestCase): class AutoDetectVersionTest(unittest.TestCase):
def test_client_init(self): def test_client_init(self):
client = docker_client(version='auto') client = helpers.docker_client(version='auto')
client_version = client._version client_version = client._version
api_version = client.version(api_version=False)['ApiVersion'] api_version = client.version(api_version=False)['ApiVersion']
self.assertEqual(client_version, api_version) self.assertEqual(client_version, api_version)
...@@ -240,7 +122,7 @@ class AutoDetectVersionTest(unittest.TestCase): ...@@ -240,7 +122,7 @@ class AutoDetectVersionTest(unittest.TestCase):
client.close() client.close()
def test_auto_client(self): def test_auto_client(self):
client = docker.AutoVersionClient(**docker_client_kwargs()) client = docker.AutoVersionClient(**helpers.docker_client_kwargs())
client_version = client._version client_version = client._version
api_version = client.version(api_version=False)['ApiVersion'] api_version = client.version(api_version=False)['ApiVersion']
self.assertEqual(client_version, api_version) self.assertEqual(client_version, api_version)
...@@ -248,7 +130,9 @@ class AutoDetectVersionTest(unittest.TestCase): ...@@ -248,7 +130,9 @@ class AutoDetectVersionTest(unittest.TestCase):
self.assertEqual(client_version, api_version_2) self.assertEqual(client_version, api_version_2)
client.close() client.close()
with self.assertRaises(docker.errors.DockerException): with self.assertRaises(docker.errors.DockerException):
docker.AutoVersionClient(**docker_client_kwargs(version='1.11')) docker.AutoVersionClient(
**helpers.docker_client_kwargs(version='1.11')
)
class ConnectionTimeoutTest(unittest.TestCase): class ConnectionTimeoutTest(unittest.TestCase):
...@@ -283,7 +167,7 @@ class UnixconnTest(unittest.TestCase): ...@@ -283,7 +167,7 @@ class UnixconnTest(unittest.TestCase):
with warnings.catch_warnings(record=True) as w: with warnings.catch_warnings(record=True) as w:
warnings.simplefilter('always') warnings.simplefilter('always')
client = docker_client() client = helpers.docker_client()
client.images() client.images()
client.close() client.close()
del client del client
......
tests/integration/build_test.py
Dosyayı görüntüle @ 1ca2bc58
...@@ -6,11 +6,11 @@ import tempfile ...@@ -6,11 +6,11 @@ import tempfile
import six import six
from . import api_test from .. import helpers
from ..base import requires_api_version from ..base import requires_api_version
class BuildTest(api_test.BaseTestCase): class BuildTest(helpers.BaseTestCase):
def test_build_streaming(self): def test_build_streaming(self):
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
......
tests/integration/conftest.py 0 → 100644
Dosyayı görüntüle @ 1ca2bc58
from __future__ import print_function
import json
import sys
import warnings
import docker.errors
import pytest
from ..helpers import BUSYBOX
from ..helpers import docker_client
@pytest.fixture(autouse=True, scope='session')
def setup_test_session():
warnings.simplefilter('error')
c = docker_client()
try:
c.inspect_image(BUSYBOX)
except docker.errors.NotFound:
print("\npulling {0}".format(BUSYBOX), file=sys.stderr)
for data in c.pull(BUSYBOX, stream=True):
data = json.loads(data.decode('utf-8'))
status = data.get("status")
progress = data.get("progress")
detail = "{0} - {1}".format(status, progress)
print(detail, file=sys.stderr)
# Double make sure we now have busybox
c.inspect_image(BUSYBOX)
c.close()
tests/integration/container_test.py
Dosyayı görüntüle @ 1ca2bc58
...@@ -9,14 +9,13 @@ import docker ...@@ -9,14 +9,13 @@ import docker
import pytest import pytest
import six import six
from . import api_test
from ..base import requires_api_version from ..base import requires_api_version
from .. import helpers from .. import helpers
BUSYBOX = api_test.BUSYBOX BUSYBOX = helpers.BUSYBOX
class ListContainersTest(api_test.BaseTestCase): class ListContainersTest(helpers.BaseTestCase):
def test_list_containers(self): def test_list_containers(self):
res0 = self.client.containers(all=True) res0 = self.client.containers(all=True)
size = len(res0) size = len(res0)
...@@ -36,7 +35,7 @@ class ListContainersTest(api_test.BaseTestCase): ...@@ -36,7 +35,7 @@ class ListContainersTest(api_test.BaseTestCase):
self.assertIn('Status', retrieved) self.assertIn('Status', retrieved)
class CreateContainerTest(api_test.BaseTestCase): class CreateContainerTest(helpers.BaseTestCase):
def test_create(self): def test_create(self):
res = self.client.create_container(BUSYBOX, 'true') res = self.client.create_container(BUSYBOX, 'true')
...@@ -161,7 +160,7 @@ class CreateContainerTest(api_test.BaseTestCase): ...@@ -161,7 +160,7 @@ class CreateContainerTest(api_test.BaseTestCase):
self.assertCountEqual(info['HostConfig']['VolumesFrom'], vol_names) self.assertCountEqual(info['HostConfig']['VolumesFrom'], vol_names)
def create_container_readonly_fs(self): def create_container_readonly_fs(self):
if not api_test.exec_driver_is_native(): if not helpers.exec_driver_is_native():
pytest.skip('Exec driver not native') pytest.skip('Exec driver not native')
ctnr = self.client.create_container( ctnr = self.client.create_container(
...@@ -368,7 +367,7 @@ class CreateContainerTest(api_test.BaseTestCase): ...@@ -368,7 +367,7 @@ class CreateContainerTest(api_test.BaseTestCase):
self.assertIn('MemorySwappiness', host_config) self.assertIn('MemorySwappiness', host_config)
class VolumeBindTest(api_test.BaseTestCase): class VolumeBindTest(helpers.BaseTestCase):
def setUp(self): def setUp(self):
super(VolumeBindTest, self).setUp() super(VolumeBindTest, self).setUp()
...@@ -458,7 +457,7 @@ class VolumeBindTest(api_test.BaseTestCase): ...@@ -458,7 +457,7 @@ class VolumeBindTest(api_test.BaseTestCase):
@requires_api_version('1.20') @requires_api_version('1.20')
class ArchiveTest(api_test.BaseTestCase): class ArchiveTest(helpers.BaseTestCase):
def test_get_file_archive_from_container(self): def test_get_file_archive_from_container(self):
data = 'The Maid and the Pocket Watch of Blood' data = 'The Maid and the Pocket Watch of Blood'
ctnr = self.client.create_container( ctnr = self.client.create_container(
...@@ -538,7 +537,7 @@ class ArchiveTest(api_test.BaseTestCase): ...@@ -538,7 +537,7 @@ class ArchiveTest(api_test.BaseTestCase):
self.assertIn('bar/', results) self.assertIn('bar/', results)
class RenameContainerTest(api_test.BaseTestCase): class RenameContainerTest(helpers.BaseTestCase):
def test_rename_container(self): def test_rename_container(self):
version = self.client.version()['Version'] version = self.client.version()['Version']
name = 'hong_meiling' name = 'hong_meiling'
...@@ -554,7 +553,7 @@ class RenameContainerTest(api_test.BaseTestCase): ...@@ -554,7 +553,7 @@ class RenameContainerTest(api_test.BaseTestCase):
self.assertEqual('/{0}'.format(name), inspect['Name']) self.assertEqual('/{0}'.format(name), inspect['Name'])
class StartContainerTest(api_test.BaseTestCase): class StartContainerTest(helpers.BaseTestCase):
def test_start_container(self): def test_start_container(self):
res = self.client.create_container(BUSYBOX, 'true') res = self.client.create_container(BUSYBOX, 'true')
self.assertIn('Id', res) self.assertIn('Id', res)
...@@ -608,7 +607,7 @@ class StartContainerTest(api_test.BaseTestCase): ...@@ -608,7 +607,7 @@ class StartContainerTest(api_test.BaseTestCase):
self.assertEqual(exitcode, 0, msg=cmd) self.assertEqual(exitcode, 0, msg=cmd)
class WaitTest(api_test.BaseTestCase): class WaitTest(helpers.BaseTestCase):
def test_wait(self): def test_wait(self):
res = self.client.create_container(BUSYBOX, ['sleep', '3']) res = self.client.create_container(BUSYBOX, ['sleep', '3'])
id = res['Id'] id = res['Id']
...@@ -636,7 +635,7 @@ class WaitTest(api_test.BaseTestCase): ...@@ -636,7 +635,7 @@ class WaitTest(api_test.BaseTestCase):
self.assertEqual(inspect['State']['ExitCode'], exitcode) self.assertEqual(inspect['State']['ExitCode'], exitcode)
class LogsTest(api_test.BaseTestCase): class LogsTest(helpers.BaseTestCase):
def test_logs(self): def test_logs(self):
snippet = 'Flowering Nights (Sakuya Iyazoi)' snippet = 'Flowering Nights (Sakuya Iyazoi)'
container = self.client.create_container( container = self.client.create_container(
...@@ -708,7 +707,7 @@ Line2''' ...@@ -708,7 +707,7 @@ Line2'''
self.assertEqual(logs, ''.encode(encoding='ascii')) self.assertEqual(logs, ''.encode(encoding='ascii'))
class DiffTest(api_test.BaseTestCase): class DiffTest(helpers.BaseTestCase):
def test_diff(self): def test_diff(self):
container = self.client.create_container(BUSYBOX, ['touch', '/test']) container = self.client.create_container(BUSYBOX, ['touch', '/test'])
id = container['Id'] id = container['Id']
...@@ -736,7 +735,7 @@ class DiffTest(api_test.BaseTestCase): ...@@ -736,7 +735,7 @@ class DiffTest(api_test.BaseTestCase):
self.assertEqual(test_diff[0]['Kind'], 1) self.assertEqual(test_diff[0]['Kind'], 1)
class StopTest(api_test.BaseTestCase): class StopTest(helpers.BaseTestCase):
def test_stop(self): def test_stop(self):
container = self.client.create_container(BUSYBOX, ['sleep', '9999']) container = self.client.create_container(BUSYBOX, ['sleep', '9999'])
id = container['Id'] id = container['Id']
...@@ -747,7 +746,7 @@ class StopTest(api_test.BaseTestCase): ...@@ -747,7 +746,7 @@ class StopTest(api_test.BaseTestCase):
self.assertIn('State', container_info) self.assertIn('State', container_info)
state = container_info['State'] state = container_info['State']
self.assertIn('ExitCode', state) self.assertIn('ExitCode', state)
if api_test.exec_driver_is_native(): if helpers.exec_driver_is_native():
self.assertNotEqual(state['ExitCode'], 0) self.assertNotEqual(state['ExitCode'], 0)
self.assertIn('Running', state) self.assertIn('Running', state)
self.assertEqual(state['Running'], False) self.assertEqual(state['Running'], False)
...@@ -763,13 +762,13 @@ class StopTest(api_test.BaseTestCase): ...@@ -763,13 +762,13 @@ class StopTest(api_test.BaseTestCase):
self.assertIn('State', container_info) self.assertIn('State', container_info)
state = container_info['State'] state = container_info['State']
self.assertIn('ExitCode', state) self.assertIn('ExitCode', state)
if api_test.exec_driver_is_native(): if helpers.exec_driver_is_native():
self.assertNotEqual(state['ExitCode'], 0) self.assertNotEqual(state['ExitCode'], 0)
self.assertIn('Running', state) self.assertIn('Running', state)
self.assertEqual(state['Running'], False) self.assertEqual(state['Running'], False)
class KillTest(api_test.BaseTestCase): class KillTest(helpers.BaseTestCase):
def test_kill(self): def test_kill(self):
container = self.client.create_container(BUSYBOX, ['sleep', '9999']) container = self.client.create_container(BUSYBOX, ['sleep', '9999'])
id = container['Id'] id = container['Id']
...@@ -780,7 +779,7 @@ class KillTest(api_test.BaseTestCase): ...@@ -780,7 +779,7 @@ class KillTest(api_test.BaseTestCase):
self.assertIn('State', container_info) self.assertIn('State', container_info)
state = container_info['State'] state = container_info['State']
self.assertIn('ExitCode', state) self.assertIn('ExitCode', state)
if api_test.exec_driver_is_native(): if helpers.exec_driver_is_native():
self.assertNotEqual(state['ExitCode'], 0) self.assertNotEqual(state['ExitCode'], 0)
self.assertIn('Running', state) self.assertIn('Running', state)
self.assertEqual(state['Running'], False) self.assertEqual(state['Running'], False)
...@@ -795,7 +794,7 @@ class KillTest(api_test.BaseTestCase): ...@@ -795,7 +794,7 @@ class KillTest(api_test.BaseTestCase):
self.assertIn('State', container_info) self.assertIn('State', container_info)
state = container_info['State'] state = container_info['State']
self.assertIn('ExitCode', state) self.assertIn('ExitCode', state)
if api_test.exec_driver_is_native(): if helpers.exec_driver_is_native():
self.assertNotEqual(state['ExitCode'], 0) self.assertNotEqual(state['ExitCode'], 0)
self.assertIn('Running', state) self.assertIn('Running', state)
self.assertEqual(state['Running'], False) self.assertEqual(state['Running'], False)
...@@ -817,7 +816,7 @@ class KillTest(api_test.BaseTestCase): ...@@ -817,7 +816,7 @@ class KillTest(api_test.BaseTestCase):
self.assertEqual(state['Running'], False, state) self.assertEqual(state['Running'], False, state)
class PortTest(api_test.BaseTestCase): class PortTest(helpers.BaseTestCase):
def test_port(self): def test_port(self):
port_bindings = { port_bindings = {
...@@ -848,7 +847,7 @@ class PortTest(api_test.BaseTestCase): ...@@ -848,7 +847,7 @@ class PortTest(api_test.BaseTestCase):
self.client.kill(id) self.client.kill(id)
class ContainerTopTest(api_test.BaseTestCase): class ContainerTopTest(helpers.BaseTestCase):
def test_top(self): def test_top(self):
container = self.client.create_container( container = self.client.create_container(
BUSYBOX, ['sleep', '60']) BUSYBOX, ['sleep', '60'])
...@@ -883,7 +882,7 @@ class ContainerTopTest(api_test.BaseTestCase): ...@@ -883,7 +882,7 @@ class ContainerTopTest(api_test.BaseTestCase):
self.client.kill(id) self.client.kill(id)
class RestartContainerTest(api_test.BaseTestCase): class RestartContainerTest(helpers.BaseTestCase):
def test_restart(self): def test_restart(self):
container = self.client.create_container(BUSYBOX, ['sleep', '9999']) container = self.client.create_container(BUSYBOX, ['sleep', '9999'])
id = container['Id'] id = container['Id']
...@@ -924,7 +923,7 @@ class RestartContainerTest(api_test.BaseTestCase): ...@@ -924,7 +923,7 @@ class RestartContainerTest(api_test.BaseTestCase):
self.client.kill(id) self.client.kill(id)
class RemoveContainerTest(api_test.BaseTestCase): class RemoveContainerTest(helpers.BaseTestCase):
def test_remove(self): def test_remove(self):
container = self.client.create_container(BUSYBOX, ['true']) container = self.client.create_container(BUSYBOX, ['true'])
id = container['Id'] id = container['Id']
...@@ -946,7 +945,7 @@ class RemoveContainerTest(api_test.BaseTestCase): ...@@ -946,7 +945,7 @@ class RemoveContainerTest(api_test.BaseTestCase):
self.assertEqual(len(res), 0) self.assertEqual(len(res), 0)
class AttachContainerTest(api_test.BaseTestCase): class AttachContainerTest(helpers.BaseTestCase):
def test_run_container_streaming(self): def test_run_container_streaming(self):
container = self.client.create_container(BUSYBOX, '/bin/sh', container = self.client.create_container(BUSYBOX, '/bin/sh',
detach=True, stdin_open=True) detach=True, stdin_open=True)
...@@ -1013,7 +1012,7 @@ class AttachContainerTest(api_test.BaseTestCase): ...@@ -1013,7 +1012,7 @@ class AttachContainerTest(api_test.BaseTestCase):
del pty_stdout._response del pty_stdout._response
class PauseTest(api_test.BaseTestCase): class PauseTest(helpers.BaseTestCase):
def test_pause_unpause(self): def test_pause_unpause(self):
container = self.client.create_container(BUSYBOX, ['sleep', '9999']) container = self.client.create_container(BUSYBOX, ['sleep', '9999'])
id = container['Id'] id = container['Id']
...@@ -1042,7 +1041,7 @@ class PauseTest(api_test.BaseTestCase): ...@@ -1042,7 +1041,7 @@ class PauseTest(api_test.BaseTestCase):
self.assertEqual(state['Paused'], False) self.assertEqual(state['Paused'], False)
class GetContainerStatsTest(api_test.BaseTestCase): class GetContainerStatsTest(helpers.BaseTestCase):
@requires_api_version('1.19') @requires_api_version('1.19')
def test_get_container_stats_no_stream(self): def test_get_container_stats_no_stream(self):
container = self.client.create_container( container = self.client.create_container(
......
tests/integration/exec_test.py
Dosyayı görüntüle @ 1ca2bc58
import pytest import pytest
from . import api_test from .. import helpers
BUSYBOX = api_test.BUSYBOX BUSYBOX = helpers.BUSYBOX
class ExecTest(api_test.BaseTestCase): class ExecTest(helpers.BaseTestCase):
def test_execute_command(self): def test_execute_command(self):
if not api_test.exec_driver_is_native(): if not helpers.exec_driver_is_native():
pytest.skip('Exec driver not native') pytest.skip('Exec driver not native')
container = self.client.create_container(BUSYBOX, 'cat', container = self.client.create_container(BUSYBOX, 'cat',
...@@ -23,7 +23,7 @@ class ExecTest(api_test.BaseTestCase): ...@@ -23,7 +23,7 @@ class ExecTest(api_test.BaseTestCase):
self.assertEqual(exec_log, b'hello\n') self.assertEqual(exec_log, b'hello\n')
def test_exec_command_string(self): def test_exec_command_string(self):
if not api_test.exec_driver_is_native(): if not helpers.exec_driver_is_native():
pytest.skip('Exec driver not native') pytest.skip('Exec driver not native')
container = self.client.create_container(BUSYBOX, 'cat', container = self.client.create_container(BUSYBOX, 'cat',
...@@ -39,7 +39,7 @@ class ExecTest(api_test.BaseTestCase): ...@@ -39,7 +39,7 @@ class ExecTest(api_test.BaseTestCase):
self.assertEqual(exec_log, b'hello world\n') self.assertEqual(exec_log, b'hello world\n')
def test_exec_command_as_user(self): def test_exec_command_as_user(self):
if not api_test.exec_driver_is_native(): if not helpers.exec_driver_is_native():
pytest.skip('Exec driver not native') pytest.skip('Exec driver not native')
container = self.client.create_container(BUSYBOX, 'cat', container = self.client.create_container(BUSYBOX, 'cat',
...@@ -55,7 +55,7 @@ class ExecTest(api_test.BaseTestCase): ...@@ -55,7 +55,7 @@ class ExecTest(api_test.BaseTestCase):
self.assertEqual(exec_log, b'default\n') self.assertEqual(exec_log, b'default\n')
def test_exec_command_as_root(self): def test_exec_command_as_root(self):
if not api_test.exec_driver_is_native(): if not helpers.exec_driver_is_native():
pytest.skip('Exec driver not native') pytest.skip('Exec driver not native')
container = self.client.create_container(BUSYBOX, 'cat', container = self.client.create_container(BUSYBOX, 'cat',
...@@ -71,7 +71,7 @@ class ExecTest(api_test.BaseTestCase): ...@@ -71,7 +71,7 @@ class ExecTest(api_test.BaseTestCase):
self.assertEqual(exec_log, b'root\n') self.assertEqual(exec_log, b'root\n')
def test_exec_command_streaming(self): def test_exec_command_streaming(self):
if not api_test.exec_driver_is_native(): if not helpers.exec_driver_is_native():
pytest.skip('Exec driver not native') pytest.skip('Exec driver not native')
container = self.client.create_container(BUSYBOX, 'cat', container = self.client.create_container(BUSYBOX, 'cat',
...@@ -89,7 +89,7 @@ class ExecTest(api_test.BaseTestCase): ...@@ -89,7 +89,7 @@ class ExecTest(api_test.BaseTestCase):
self.assertEqual(res, b'hello\nworld\n') self.assertEqual(res, b'hello\nworld\n')
def test_exec_inspect(self): def test_exec_inspect(self):
if not api_test.exec_driver_is_native(): if not helpers.exec_driver_is_native():
pytest.skip('Exec driver not native') pytest.skip('Exec driver not native')
container = self.client.create_container(BUSYBOX, 'cat', container = self.client.create_container(BUSYBOX, 'cat',
......
tests/integration/image_test.py
Dosyayı görüntüle @ 1ca2bc58
...@@ -14,12 +14,12 @@ from six.moves import socketserver ...@@ -14,12 +14,12 @@ from six.moves import socketserver
import docker import docker
from . import api_test from .. import helpers
BUSYBOX = api_test.BUSYBOX BUSYBOX = helpers.BUSYBOX
class ListImagesTest(api_test.BaseTestCase): class ListImagesTest(helpers.BaseTestCase):
def test_images(self): def test_images(self):
res1 = self.client.images(all=True) res1 = self.client.images(all=True)
self.assertIn('Id', res1[0]) self.assertIn('Id', res1[0])
...@@ -37,7 +37,7 @@ class ListImagesTest(api_test.BaseTestCase): ...@@ -37,7 +37,7 @@ class ListImagesTest(api_test.BaseTestCase):
self.assertEqual(type(res1[0]), six.text_type) self.assertEqual(type(res1[0]), six.text_type)
class PullImageTest(api_test.BaseTestCase): class PullImageTest(helpers.BaseTestCase):
def test_pull(self): def test_pull(self):
try: try:
self.client.remove_image('hello-world') self.client.remove_image('hello-world')
...@@ -70,7 +70,7 @@ class PullImageTest(api_test.BaseTestCase): ...@@ -70,7 +70,7 @@ class PullImageTest(api_test.BaseTestCase):
self.assertIn('Id', img_info) self.assertIn('Id', img_info)
class CommitTest(api_test.BaseTestCase): class CommitTest(helpers.BaseTestCase):
def test_commit(self): def test_commit(self):
container = self.client.create_container(BUSYBOX, ['touch', '/test']) container = self.client.create_container(BUSYBOX, ['touch', '/test'])
id = container['Id'] id = container['Id']
...@@ -91,7 +91,7 @@ class CommitTest(api_test.BaseTestCase): ...@@ -91,7 +91,7 @@ class CommitTest(api_test.BaseTestCase):
self.assertEqual(img['Parent'], busybox_id) self.assertEqual(img['Parent'], busybox_id)
class RemoveImageTest(api_test.BaseTestCase): class RemoveImageTest(helpers.BaseTestCase):
def test_remove(self): def test_remove(self):
container = self.client.create_container(BUSYBOX, ['touch', '/test']) container = self.client.create_container(BUSYBOX, ['touch', '/test'])
id = container['Id'] id = container['Id']
...@@ -107,7 +107,7 @@ class RemoveImageTest(api_test.BaseTestCase): ...@@ -107,7 +107,7 @@ class RemoveImageTest(api_test.BaseTestCase):
self.assertEqual(len(res), 0) self.assertEqual(len(res), 0)
class ImportImageTest(api_test.BaseTestCase): class ImportImageTest(helpers.BaseTestCase):
'''Base class for `docker import` test cases.''' '''Base class for `docker import` test cases.'''
TAR_SIZE = 512 * 1024 TAR_SIZE = 512 * 1024
......
tests/integration/network_test.py
Dosyayı görüntüle @ 1ca2bc58
...@@ -3,12 +3,12 @@ import random ...@@ -3,12 +3,12 @@ import random
import docker import docker
import pytest import pytest
from . import api_test from .. import helpers
from ..base import requires_api_version from ..base import requires_api_version
@requires_api_version('1.21') @requires_api_version('1.21')
class TestNetworks(api_test.BaseTestCase): class TestNetworks(helpers.BaseTestCase):
def create_network(self, *args, **kwargs): def create_network(self, *args, **kwargs):
net_name = u'dockerpy{}'.format(random.getrandbits(24))[:14] net_name = u'dockerpy{}'.format(random.getrandbits(24))[:14]
net_id = self.client.create_network(net_name, *args, **kwargs)['Id'] net_id = self.client.create_network(net_name, *args, **kwargs)['Id']
......
tests/integration/regression_test.py
Dosyayı görüntüle @ 1ca2bc58
...@@ -4,12 +4,12 @@ import random ...@@ -4,12 +4,12 @@ import random
import docker import docker
import six import six
from . import api_test from .. import helpers
BUSYBOX = api_test.BUSYBOX BUSYBOX = helpers.BUSYBOX
class TestRegressions(api_test.BaseTestCase): class TestRegressions(helpers.BaseTestCase):
def test_443_handle_nonchunked_response_in_stream(self): def test_443_handle_nonchunked_response_in_stream(self):
dfile = io.BytesIO() dfile = io.BytesIO()
with self.assertRaises(docker.errors.APIError) as exc: with self.assertRaises(docker.errors.APIError) as exc:
......
tests/integration/volume_test.py
Dosyayı görüntüle @ 1ca2bc58
import docker import docker
import pytest import pytest
from . import api_test from .. import helpers
from ..base import requires_api_version from ..base import requires_api_version
@requires_api_version('1.21') @requires_api_version('1.21')
class TestVolumes(api_test.BaseTestCase): class TestVolumes(helpers.BaseTestCase):
def test_create_volume(self): def test_create_volume(self):
name = 'perfectcherryblossom' name = 'perfectcherryblossom'
self.tmp_volumes.append(name) self.tmp_volumes.append(name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment