Skip to content
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

Jump to bottom

Integration tests: Update testenv.ProtectAll() to also cleanup Services #36581

Open
thaJeztah opened this issue Mar 13, 2018 · 4 comments
Open

Integration tests: Update testenv.ProtectAll() to also cleanup Services #36581

thaJeztah opened this issue Mar 13, 2018 · 4 comments
Labels
area/testing exp/beginner exp/intermediate kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. status/claimed

Comments

@thaJeztah
Copy link
Member

Creating a tracking issue for #36538 (comment)

We should update testenv.ProtectAll() and testenv.Clean() to also cleanup services, so that integration-tests don't have to clean up services after running the tests.

Similar to the way containers, networks, and other resources are currently handled;

moby/internal/test/environment/protect.go

Lines 32 to 43 in 3e0299f

// ProtectAll protects the existing environment (containers, images, networks,
// volumes, and, on Linux, plugins) from being cleaned up at the end of test
// runs
func ProtectAll(t testingT, testEnv *Execution) {
ProtectContainers(t, testEnv)
ProtectImages(t, testEnv)
ProtectNetworks(t, testEnv)
ProtectVolumes(t, testEnv)
if testEnv.OSType == "linux" {
ProtectPlugins(t, testEnv)
}
}

moby/internal/test/environment/clean.go

Lines 25 to 42 in 3e0299f

// Clean the environment, preserving protected objects (images, containers, ...)
// and removing everything else. It's meant to run after any tests so that they don't
// depend on each others.
func (e *Execution) Clean(t testingT) {
client := e.APIClient()
platform := e.OSType
if (platform != "windows") || (platform == "windows" && e.DaemonInfo.Isolation == "hyperv") {
unpauseAllContainers(t, client)
}
deleteAllContainers(t, client, e.protectedElements.containers)
deleteAllImages(t, client, e.protectedElements.images)
deleteAllVolumes(t, client, e.protectedElements.volumes)
deleteAllNetworks(t, client, platform, e.protectedElements.networks)
if platform == "linux" {
deleteAllPlugins(t, client, e.protectedElements.plugins)
}
}

labelling with both "beginner" and "intermediate"; it's probably somewhere in between 😄
@thaJeztah thaJeztah added kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. exp/beginner exp/intermediate area/testing labels Mar 13, 2018
This was referenced Mar 13, 2018
Merged
Merged
@daeMOn63
Copy link

I'll give a try at this one

@thaJeztah
Copy link
Member Author

Thanks! Give us a shout if you need help (@vdemeester and @dnephin are probably most familiar with this code)

@daeMOn63 daeMOn63 mentioned this issue Mar 25, 2018
Closed
@daeMOn63
Copy link

I'm not sure why some tests fails here. @vdemeester / @dnephin can you please have a look and tell me if anything is missing ?

@dnephin
Copy link
Member

dnephin commented Mar 26, 2018

I actually wonder now if we need this. Most of the time when we run services it is against a daemon that is started just for that test case. I don't think we enable swarm mode for the shared daemon.

@thaJeztah thaJeztah mentioned this issue Jan 7, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
area/testing exp/beginner exp/intermediate kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. status/claimed
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Added services cleanup created during integration tests. daeMOn63/moby
3 participants
@dnephin @daeMOn63 @thaJeztah