Fix missing portalNets in tests once and for all by adding a default.

This commit is contained in:
Daniel Smith
2014-10-29 12:27:35 -07:00
parent 858b557bbb
commit 070c6c0440
3 changed files with 9 additions and 15 deletions

View File

@@ -19,7 +19,6 @@ limitations under the License.
package integration
import (
"net"
"net/http"
"net/http/httptest"
"reflect"
@@ -30,8 +29,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version"
"github.com/golang/glog"
)
func init() {
@@ -45,13 +42,8 @@ func TestClient(t *testing.T) {
}
mux := http.NewServeMux()
_, portalNet, err := net.ParseCIDR("10.0.0.0/24")
if err != nil {
glog.Fatalf("Unable to parse CIDR: %v", err)
}
master.New(&master.Config{
EtcdHelper: helper,
PortalNet: portalNet,
Mux: mux,
EnableLogsSupport: false,
EnableUISupport: false,