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

Add skip detection for all docker tests #221

Merged
merged 3 commits into from
Oct 7, 2015
Merged

Add skip detection for all docker tests #221

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28fef04
Add skip detection for all docker tests
cbednarski Oct 6, 2015
629a56e
This is needed for 1.4.2 compat; not sure what removed it
cbednarski Oct 6, 2015
2801e7d
Fingerprint test should now behave correctly when the executor is not…
cbednarski Oct 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/driver/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@ func taskTemplate() *structs.Task {
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add the same to TestDockerDriver_Fingerprint

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is changed. It should now make sure the fingerprinter applies when it finds docker / java on the system. If docker is missing the fingerprinter should detect this and say it's not there. The fingerprinter should always be run, though. This allows us to verify it does not e.g. panic for silly reasons.


func TestDocker_StartN(t *testing.T) {
if !dockerLocated() {
t.SkipNow()
}

task1 := taskTemplate()
task1.Resources.Networks[0].ReservedPorts[0] = 11111
Expand Down Expand Up @@ -243,6 +246,9 @@ func TestDocker_StartN(t *testing.T) {
}

func TestDocker_StartNVersions(t *testing.T) {
if !dockerLocated() {
t.SkipNow()
}

task1 := taskTemplate()
task1.Config["image"] = "redis"
Expand Down Expand Up @@ -289,6 +295,10 @@ func TestDocker_StartNVersions(t *testing.T) {
}

func TestDockerHostNet(t *testing.T) {
if !dockerLocated() {
t.SkipNow()
}

task := &structs.Task{
Config: map[string]string{
"image": "redis",
Expand Down