From 969451b558ed35c7a7bc7041a4cf852c3a917bbb Mon Sep 17 00:00:00 2001 From: Yongkun Anfernee Gui Date: Mon, 21 May 2018 17:39:22 -0700 Subject: [PATCH] Fix test.sh and enable test on OSX --- .travis.yml | 5 ----- test.sh | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e284c51d6..deadfcd647 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,6 @@ os: - linux - osx -matrix: - # allow failures until OSX tests have been tested for a while - allow_failures: - - os: osx - go: - "1.10" diff --git a/test.sh b/test.sh index 3a7798e88a..8230f7b017 100755 --- a/test.sh +++ b/test.sh @@ -163,7 +163,9 @@ function generate_crd_resources { ' pkg/controller/bee/controller.go header_text "adding a map type to resource" - sed -i -e "s|type BeeSpec struct {|type BeeSpec struct {\n Request map[string]string \`json:\"request,omitempty\"\`|" pkg/apis/insect/v1beta1/bee_types.go + sed -i -e '/type BeeSpec struct {/ a \ + Request map[string]string \`json:\"request,omitempty\"\` + ' pkg/apis/insect/v1beta1/bee_types.go header_text "generating and testing CRD definition" kubebuilder create config --crds --output crd.yaml