Skip to content

Always use port 8053 in integration tests #1308

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

Merged
openshift-bot merged 1 commit into from
Mar 14, 2015
Merged

Always use port 8053 in integration tests #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/integration/dns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package integration

import (
"fmt"
"testing"
"time"

Expand All @@ -13,12 +12,13 @@ import (
)

func TestDNS(t *testing.T) {
cfg, err := StartTestAllInOne()
_, err := StartTestAllInOne()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
port := cfg.DNSBindAddr.Port
server := fmt.Sprintf("127.0.0.1:%d", port)

// ugly...
server := "127.0.0.1:8053"

// verify service DNS entry is visible
stop := make(chan struct{})
Expand Down
2 changes: 2 additions & 0 deletions test/integration/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ func StartTestServer(args ...string) (start.Config, error) {
deleteAllEtcdKeys()

startConfig := start.NewDefaultConfig()
startConfig.DNSBindAddr.DefaultPort = 8053
startConfig.DNSBindAddr = startConfig.DNSBindAddr.Default()

basedir := path.Join(os.TempDir(), "openshift-integration-tests")

Expand Down