scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/integration: Make localPort reusable as FindFreeLocalPort

Browse Source
This commit is contained in:
Maru Newby
2017-03-01 17:28:40 -08:00
parent 6f70b977ff
commit 82dc083016
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/integration/examples/apiserver_test.go
View File

@@ -56,20 +56,6 @@ var groupVersionForDiscovery = metav1.GroupVersionForDiscovery{
Version: groupVersion.Version,
}
func localPort() (int, error) {
l, err := net.Listen("tcp", ":0")
if err != nil {
return 0, err
}
defer l.Close()
addr := strings.Split(l.Addr().String(), ":")
port, err := strconv.Atoi(addr[len(addr)-1])
if err != nil {
return 0, err
}
return port, nil
}
func TestAggregatedAPIServer(t *testing.T) {
stopCh := make(chan struct{})
defer close(stopCh)
@@ -106,7 +92,7 @@ func TestAggregatedAPIServer(t *testing.T) {
go func() {
for {
// always get a fresh port in case something claimed the old one
kubePort, err := localPort()
kubePort, err := framework.FindFreeLocalPort()
if err != nil {
t.Fatal(err)
}
@@ -179,7 +165,7 @@ func TestAggregatedAPIServer(t *testing.T) {
go func() {
for {
// always get a fresh port in case something claimed the old one
wardlePortInt, err := localPort()
wardlePortInt, err := framework.FindFreeLocalPort()
if err != nil {
t.Fatal(err)
}
@@ -256,7 +242,7 @@ func TestAggregatedAPIServer(t *testing.T) {
go func() {
for {
// always get a fresh port in case something claimed the old one
aggregatorPortInt, err := localPort()
aggregatorPortInt, err := framework.FindFreeLocalPort()
if err != nil {
t.Fatal(err)
}

23
test/integration/framework/master_utils.go
View File

@@ -22,6 +22,7 @@ import (
"net/http"
"net/http/httptest"
goruntime "runtime"
"strconv"
"sync"
"testing"
"time"
@@ -509,3 +510,25 @@ func RunParallel(task Task, numTasks, numWorkers int) {
wg.Wait()
close(semCh)
}
// FindFreeLocalPort returns the number of an available port number on
// the loopback interface. Useful for determining the port to launch
// a server on. Error handling required - there is a non-zero chance
// that the returned port number will be bound by another process
// after this function returns.
func FindFreeLocalPort() (int, error) {
l, err := net.Listen("tcp", ":0")
if err != nil {
return 0, err
}
defer l.Close()
_, portStr, err := net.SplitHostPort(l.Addr().String())
if err != nil {
return 0, err
}
port, err := strconv.Atoi(portStr)
if err != nil {
return 0, err
}
return port, nil
}