From c04357c32dded9d41c0fec058e1023b811a32d46 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 13 Apr 2017 10:23:05 +1000 Subject: [PATCH] fix the tests post 1.0.0 Signed-off-by: Sven Dowideit --- .../datasource/metadata/gce/metadata_test.go | 22 +++++++++---------- scripts/ci | 2 +- scripts/test | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/cloudinit/datasource/metadata/gce/metadata_test.go b/config/cloudinit/datasource/metadata/gce/metadata_test.go index 156fa7f2..c4f1ee24 100755 --- a/config/cloudinit/datasource/metadata/gce/metadata_test.go +++ b/config/cloudinit/datasource/metadata/gce/metadata_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/rancher/os/netconf" + //"github.com/rancher/os/netconf" "github.com/rancher/os/config/cloudinit/datasource" "github.com/rancher/os/config/cloudinit/datasource/metadata" @@ -75,16 +75,16 @@ func TestFetchMetadata(t *testing.T) { Hostname: "host", PrivateIPv4: net.ParseIP("1.2.3.4"), PublicIPv4: net.ParseIP("5.6.7.8"), - NetworkConfig: netconf.NetworkConfig{ - Interfaces: map[string]netconf.InterfaceConfig{ - "eth0": netconf.InterfaceConfig{ - Addresses: []string{ - "5.6.7.8", - "1.2.3.4", - }, - }, - }, - }, + // NetworkConfig: netconf.NetworkConfig{ + // Interfaces: map[string]netconf.InterfaceConfig{ + // "eth0": netconf.InterfaceConfig{ + // Addresses: []string{ + // "5.6.7.8", + // "1.2.3.4", + // }, + // }, + // }, + // }, }, }, { diff --git a/scripts/ci b/scripts/ci index 4440e8a1..8b6570bc 100755 --- a/scripts/ci +++ b/scripts/ci @@ -1,5 +1,5 @@ #!/bin/bash -#set -e +set -e cd $(dirname $0)/.. diff --git a/scripts/test b/scripts/test index f8f4ce16..e360a109 100755 --- a/scripts/test +++ b/scripts/test @@ -1,6 +1,6 @@ #!/bin/bash # help: Run go unit tests -#set -e +set -e cd $(dirname $0)/..