From f69081242e0db81c5c9cc3c95f02673b344f59ff Mon Sep 17 00:00:00 2001
From: chenk008 <kongchen28@gmail.com>
Date: Fri, 10 Jan 2020 06:16:08 +0800
Subject: [PATCH] Ray operator travis (#6731)

---
 .travis.yml                                   |  8 +++
 deploy/ray-operator/controllers/suite_test.go | 65 -------------------
 .../controllers/utils/util_test.go            | 18 +++++
 3 files changed, 26 insertions(+), 65 deletions(-)
 delete mode 100644 deploy/ray-operator/controllers/suite_test.go
 create mode 100644 deploy/ray-operator/controllers/utils/util_test.go

diff --git a/.travis.yml b/.travis.yml
index 008d9bae5..e52e264fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -147,6 +147,8 @@ install:
   - ./ci/suppress_output ./ci/travis/install-ray.sh
   - ./ci/suppress_output ./ci/travis/install-cython-examples.sh
 
+  - eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=master bash)"
+
 script:
   - export PATH="$HOME/miniconda/bin:$PATH"
 
@@ -167,6 +169,12 @@ script:
 
   - ./ci/keep_alive bazel test --spawn_strategy=local --flaky_test_attempts=3 --nocache_test_results --test_verbose_timeout_warnings --progress_report_interval=100 --show_progress_rate_limit=100 --show_timestamps --test_output=errors --test_tag_filters=-jenkins_only python/ray/...
 
+  # ray operator tests
+  - cd ./deploy/ray-operator/
+  - go build
+  - go test ./...
+  - cd ../..
+
 deploy:
   - provider: s3
     edge: true  # This supposedly opts in to deploy v2.
diff --git a/deploy/ray-operator/controllers/suite_test.go b/deploy/ray-operator/controllers/suite_test.go
deleted file mode 100644
index 909b4ebb1..000000000
--- a/deploy/ray-operator/controllers/suite_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package controllers
-
-import (
-	"path/filepath"
-	"testing"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	rayv1 "ray-operator/api/v1alpha1"
-
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	// +kubebuilder:scaffold:imports
-)
-
-// These tests use Ginkgo (BDD-style Go testing framework). Refer to
-// http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
-
-var cfg *rest.Config
-var k8sClient client.Client
-var testEnv *envtest.Environment
-
-func TestAPIs(t *testing.T) {
-	RegisterFailHandler(Fail)
-
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Controller Suite",
-		[]Reporter{envtest.NewlineReporter{}})
-}
-
-var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
-
-	By("bootstrapping test environment")
-	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
-	}
-
-	var err error
-	cfg, err = testEnv.Start()
-	Expect(err).ToNot(HaveOccurred())
-	Expect(cfg).ToNot(BeNil())
-
-	err = rayv1.AddToScheme(scheme.Scheme)
-	Expect(err).NotTo(HaveOccurred())
-
-	// +kubebuilder:scaffold:scheme
-
-	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
-	Expect(err).ToNot(HaveOccurred())
-	Expect(k8sClient).ToNot(BeNil())
-
-	close(done)
-}, 60)
-
-var _ = AfterSuite(func() {
-	By("tearing down the test environment")
-	err := testEnv.Stop()
-	Expect(err).ToNot(HaveOccurred())
-})
diff --git a/deploy/ray-operator/controllers/utils/util_test.go b/deploy/ray-operator/controllers/utils/util_test.go
new file mode 100644
index 000000000..582004d9f
--- /dev/null
+++ b/deploy/ray-operator/controllers/utils/util_test.go
@@ -0,0 +1,18 @@
+package utils
+
+import "testing"
+
+func TestBefore(t *testing.T) {
+	if Before("a","b") != ""{
+		t.Fail()
+	}
+
+	if Before("aaa","a") != ""{
+		t.Fail()
+	}
+
+	if Before("aab","b") != "aa"{
+		t.Fail()
+	}
+}
+