Skip to content

[FLOC-4506] Remove the obsolete container API tests#2917

Merged
wallrj merged 14 commits intoremove-container-api-FLOC-4505from
remove-obsolete-container-acceptance-tests-FLOC-4506
Oct 4, 2016
Merged

[FLOC-4506] Remove the obsolete container API tests#2917
wallrj merged 14 commits intoremove-container-api-FLOC-4505from
remove-obsolete-container-acceptance-tests-FLOC-4506

Conversation

@wallrj
Copy link
Contributor

@wallrj wallrj commented Oct 4, 2016

Fixes: https://clusterhq.atlassian.net/browse/FLOC-4506

Also removed container agent related flocker-diagnostics tests and various ancillary code which appears not to be used elsewhere.

This is the same as #2914 but merging into the remove-container-api-FLOC-4505 feature branch instead of into master.

Copy link
Contributor

@wallnerryan wallnerryan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one question and 1 nit but overall looks good and tests are passing. wish I had more time spent on this review though, but merge when you are happy.

DOCKER_CLIENT_LOCK = DeferredLock()


def deferToThreadWithLock(lock, f, *args, **kwargs):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CamelCase?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for functions.

:param Cluster cluster: The ``Cluster`` with certificates for
authenticating with the docker daemon on ``node``.
:param unicode image_name: A name of the Docker image to use.
:param Dataset dataset: The mounted Flocker dataset to bind mount into the
Copy link
Contributor

@wallnerryan wallnerryan Oct 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do we cleanup this dataset? I think im missing where that happens.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The create_dataset(test=self, ...) function registers a TestCase.addCleanup function to remove the dataset using a Flocker API call.

@wallrj
Copy link
Contributor Author

wallrj commented Oct 4, 2016

Thanks for the review @wallnerryan.
Merging now...

@wallrj wallrj merged commit 347b51b into remove-container-api-FLOC-4505 Oct 4, 2016
@wallrj wallrj deleted the remove-obsolete-container-acceptance-tests-FLOC-4506 branch October 4, 2016 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants