Use docker networks and aliases instead links in tests #352
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kokosing
suggested changes
Dec 8, 2017
tests/docker_cluster.py
Outdated
| @@ -211,7 +211,6 @@ def _create_and_start_containers(self, master_image, slave_image=None, cmd=None, | |||
| self._get_network().connect(self.master) | |||
| container = self.client.containers.get(self.master) | |||
| container.start() | |||
| self._add_hostnames_to_slaves() | |||
There was a problem hiding this comment.
You could explain a bit why it is no longer needed in the commit message
tests/docker_cluster.py
Outdated
| try: | ||
| self._get_network().remove() | ||
| except NotFound: | ||
| pass |
There was a problem hiding this comment.
Why is so? Maybe a warning?
There was a problem hiding this comment.
I think it is not need. Will remove.
tests/docker_cluster.py
Outdated
| @@ -206,8 +223,14 @@ def _create_container(self, image, container_name, hostname, cmd, **kwargs): | |||
| volumes={master_mount_dir: {'bind': self.mount_dir, 'mode': 'rw'}}, | |||
| command=cmd, | |||
| mem_limit='2g', | |||
| network=None, | |||
| # network=self._network_name, | |||
tests/docker_cluster.py
Outdated
| **kwargs) | ||
|
|
||
| self._get_network().connect( | ||
| container_name, | ||
| aliases=[hostname.split('-')[0]]) |
There was a problem hiding this comment.
why do you use split here -? How hostname look like?
tests/docker_cluster.py
Outdated
| **kwargs) | ||
|
|
||
| self._get_network().connect(self.master) |
There was a problem hiding this comment.
master should be already connected, see line 204 where you call _create_container
tests/product/base_product_case.py
Outdated
| # all possible error messages one might encounter when trying to perform an action when a | ||
| # node is not accessible. The variety in error messages comes from differences in the OS. | ||
| down_node_connection_string = r'(\nWarning: (\[%(host)s\] )?Low level ' \ | ||
| network_unreachable = r'(\nWarning: (\[%(host)s\] )?Low level ' \ |
There was a problem hiding this comment.
Is this one is still valid once you ported tests to use network? I thought only one of these two errors should be expected.
|
Also make sure travis is passing. Other than that you did a great job! |
Docker networks provide name resolution automatically so we do not need to hack around /etc/hosts anymore.
As we are using network instead of links now, shuting down container results in getting `Name lookup failed for ...` error on other ones when trying to access the shut down one. Augmenting assertion to follow that.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.