Skip to content

Update all client instances in integration tests to use DOCKER_HOST #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2015
Merged

Update all client instances in integration tests to use DOCKER_HOST #674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tests/integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ def runTest(self):
self.assertFalse(inspect_data['VolumesRW'][mount_dest])


@unittest.skipIf(NOT_ON_HOST, 'Tests running inside a container; no syslog')
class TestCreateContainerWithLogConfig(BaseTestCase):
def runTest(self):
config = docker.utils.LogConfig(
Expand Down Expand Up @@ -1386,7 +1387,7 @@ def runTest(self):

class TestAutoDetectVersion(unittest.TestCase):
def test_client_init(self):
client = docker.Client(version='auto')
client = docker.Client(base_url=DEFAULT_BASE_URL, version='auto')
client_version = client._version
api_version = client.version(api_version=False)['ApiVersion']
self.assertEqual(client_version, api_version)
Expand All @@ -1395,15 +1396,15 @@ def test_client_init(self):
client.close()

def test_auto_client(self):
client = docker.AutoVersionClient()
client = docker.AutoVersionClient(base_url=DEFAULT_BASE_URL)
client_version = client._version
api_version = client.version(api_version=False)['ApiVersion']
self.assertEqual(client_version, api_version)
api_version_2 = client.version()['ApiVersion']
self.assertEqual(client_version, api_version_2)
client.close()
with self.assertRaises(docker.errors.DockerException):
docker.AutoVersionClient(version='1.11')
docker.AutoVersionClient(base_url=DEFAULT_BASE_URL, version='1.11')


class TestConnectionTimeout(unittest.TestCase):
Expand Down