Skip to content

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

Closed
wallrj wants to merge 14 commits intomasterfrom
remove-obsolete-container-acceptance-tests-FLOC-4506
Closed

[FLOC-4506] Remove the obsolete container API tests #2914
wallrj wants to merge 14 commits intomasterfrom
remove-obsolete-container-acceptance-tests-FLOC-4506

Conversation

@wallrj
Copy link
Contributor

@wallrj wallrj commented Sep 29, 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.

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.

preliminary review, i know your still working on this one.

@@ -876,18 +747,6 @@ def cleanup_all_containers(_):
for container in client.containers():
client.remove_container(container["Id"], force=True)
Copy link
Contributor

Choose a reason for hiding this comment

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

is this calling the container API or docker?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That one calls the Docker API to remove all containers.

d = DeferredContext(cleanup_leases())
d.addCallback(cleanup_flocker_containers)
if remove_foreign_containers:
d.addCallback(cleanup_all_containers)
Copy link
Contributor

Choose a reason for hiding this comment

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

same, does this call docker or the container api?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, same thing. It calls the Docker API.

return d


def is_process_running(node, name):
Copy link
Contributor

Choose a reason for hiding this comment

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

this doesnt seem specific to container-agent removal, intended to be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That function is no longer used inside Flocker so I decided to remove it.
Same for a bunch of other functions.
It seemed better than leaving them lying around and future maintainers having to think about why the function exists.

@wallrj
Copy link
Contributor Author

wallrj commented Oct 4, 2016

I replaced this with #2917 so that I can merge into a remove container API feature branch.

@wallrj wallrj closed this 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