Merge pull request #184 from arschles/more-better-tests-2

Test Improvements II

Author: arschles

.gitignore

@@ -29,6 +29,7 @@ docs/docs.zip
 docs/dummy.sqlite3
 manifests/*.tmp.yml
 _tests/_tests.test
+_tests/example-*/
 
 # coverage reports
 .coverage

_tests/auth_test.go

@@ -56,13 +56,13 @@ var _ = Describe("Auth", func() {
 		It("regenerates the token for a specified user", func() {
 			output, err := execute("deis auth:regenerate -u %s", testUser)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("???"))
+			Expect(output).To(ContainSubstring("Token Regenerated"))
 		})
 
 		It("regenerates the token for all users", func() {
 			output, err := execute("deis auth:regenerate --all")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("???"))
+			Expect(output).To(ContainSubstring("Token Regenerated"))
 		})
 	})
 })

_tests/keys_test.go

@@ -2,6 +2,8 @@ package _tests_test
 
 import (
 	"os"
+	"os/user"
+	"path"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -10,38 +12,40 @@ import (
 var _ = Describe("Keys", func() {
 	key := testUser
 
-	BeforeEach(func() {
-		addKey(key)
-	})
-
-	AfterEach(func() {
-		// remove the generated ssh key
-		key := testUser
-		execute("deis keys:remove %s", key)
-		err := os.Remove(key)
-		Expect(err).NotTo(HaveOccurred())
-		err = os.Remove(key + ".pub")
-		Expect(err).NotTo(HaveOccurred())
-	})
+	Context("when logged in as a normal user", func() {
+		BeforeEach(func() {
+			login(url, testUser, testPassword)
+			createKey(testUser)
+		})
 
-	Context("with a new key", func() {
+		AfterEach(func() {
+			// remove the generated ssh key
+			var home string
+			if user, err := user.Current(); err != nil {
+				home = "~"
+			} else {
+				home = user.HomeDir
+			}
+			path := path.Join(home, ".ssh", testUser)
+			err := os.Remove(path)
+			Expect(err).NotTo(HaveOccurred())
+			err = os.Remove(path + ".pub")
+			Expect(err).NotTo(HaveOccurred())
+		})
 
-		It("can add the key", func() {
-			output, err := execute("deis keys:add %s.pub", key)
+		It("can add, list, and remove a key", func() {
+			output, err := execute("deis keys:add ~/.ssh/%s.pub", key)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).To(ContainSubstring("Uploading %s.pub to deis... done", key))
 			output, err = execute("deis keys:list")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("%s@deis.com", key))
-		})
-
-		It("can remove the key", func() {
-			output, err := execute("deis keys:remove %s@deis.com", key)
+			Expect(output).To(ContainSubstring("%s ssh-rsa", key))
+			output, err = execute("deis keys:remove %s", key)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("Removing %s@deis.com SSH Key... done", key))
+			Expect(output).To(ContainSubstring("Removing %s SSH Key... done", key))
 			output, err = execute("deis keys")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(output).NotTo(ContainSubstring("%s@deis.com", key))
+			Expect(output).NotTo(ContainSubstring("%s ssh-rsa", key))
 		})
 	})
 })

_tests/tests_suite_test.go

@@ -17,6 +17,11 @@ import (
 	"testing"
 )
 
+const (
+	deisWorkflowServiceHost = "DEIS_WORKFLOW_SERVICE_HOST"
+	deisWorkflowServicePort = "DEIS_WORKFLOW_SERVICE_PORT"
+)
+
 func init() {
 	rand.Seed(GinkgoConfig.RandomSeed)
 }
@@ -41,19 +46,22 @@ var (
 )
 
 var _ = BeforeSuite(func() {
-	workflowHost := os.Getenv("DEIS_WORKFLOW_SERVICE_HOST")
-	Expect(workflowHost).ShouldNot(BeEmpty())
 	// use the "deis" executable in the search $PATH
 	_, err := exec.LookPath("deis")
 	Expect(err).NotTo(HaveOccurred())
 
 	// register the test-admin user
 	register(url, testAdminUser, testAdminPassword, testAdminEmail)
-	// TODO: verify that this user is actually an admin
+	// verify this user is an admin by running a privileged command
+	_, err = execute("deis users:list")
+	Expect(err).NotTo(HaveOccurred())
 
 	// register the test user and add a key
 	register(url, testUser, testPassword, testEmail)
-	addKey("deis-test")
+	createKey("deis-test")
+	output, err := execute("deis keys:add ~/.ssh/deis-test.pub")
+	Expect(err).NotTo(HaveOccurred())
+	Expect(output).To(ContainSubstring("Uploading deis-test.pub to deis... done"))
 })
 
 var _ = AfterSuite(func() {
@@ -108,7 +116,7 @@ func execute(cmdLine string, args ...interface{}) (string, error) {
 	return stdout.String(), nil
 }
 
-func addKey(name string) {
+func createKey(name string) {
 	var home string
 	if user, err := user.Current(); err != nil {
 		home = "~"
@@ -118,24 +126,24 @@ func addKey(name string) {
 	path := path.Join(home, ".ssh", name)
 	// create the key under ~/.ssh/<name> if it doesn't already exist
 	if _, err := os.Stat(path); os.IsNotExist(err) {
-		cmd := "ssh-keygen -q -t rsa -b 4096 -C otto.test@deis.com -f %s -N ''"
-		_, err := execute(cmd, path)
+		cmd := "ssh-keygen -q -t rsa -b 4096 -C %s -f %s -N ''"
+		_, err := execute(cmd, name, path)
 		Expect(err).NotTo(HaveOccurred())
 	}
 	// add the key to ssh-agent
 	_, err := execute("eval $(ssh-agent) && ssh-add %s", path)
 	Expect(err).NotTo(HaveOccurred())
-	// add the public key to deis (assumes the user is logged in)
-	_, err = execute("deis keys:add %s.pub", path)
-	Expect(err).NotTo(HaveOccurred())
 }
 
 func getController() string {
-	host := os.Getenv("DEIS_WORKFLOW_SERVICE_HOST")
+	host := os.Getenv(deisWorkflowServiceHost)
 	if host == "" {
-		panic("DEIS_WORKFLOW_SERVICE_HOST isn't set")
+		panicStr := fmt.Sprintf(`Set %s to the workflow controller hostname for tests, such as:
+
+$ %s=deis.10.245.1.3.xip.io make test-integration`, deisWorkflowServiceHost, deisWorkflowServiceHost)
+		panic(panicStr)
 	}
-	port := os.Getenv("DEIS_WORKFLOW_SERVICE_PORT")
+	port := os.Getenv(deisWorkflowServicePort)
 	switch port {
 	case "443":
 		return "https://" + host