Merge pull request #212 from arschles/graceful-after

fix(tests_suite_test.go): cancel accounts gracefully in the AfterSuite block

Author: arschles

_tests/tests_suite_test.go

@@ -3,7 +3,6 @@ package _tests_test
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"math/rand"
 	"os"
 	"os/exec"
@@ -68,11 +67,16 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	// cancel the test user
-	cancel(url, testUser, testPassword)
-
-	// cancel the test-admin user
-	cancel(url, testAdminUser, testAdminPassword)
+	cancelUserSess, cancelUserErr := cancelSess(url, testUser, testPassword)
+	cancelAdminSess, cancelAdminErr := cancelSess(url, testAdminUser, testAdminPassword)
+	Expect(cancelUserErr).To(BeNil())
+	Expect(cancelAdminErr).To(BeNil())
+	cancelUserSess.Wait()
+	cancelAdminSess.Wait()
+	Expect(cancelUserSess.ExitCode()).To(BeZero())
+	Expect(cancelAdminSess.ExitCode()).To(BeZero())
+	Expect(cancelUserSess.Out.Contents()).To(ContainSubstring("Account cancelled"))
+	Expect(cancelAdminSess.Out.Contents()).To(ContainSubstring("Account cancelled"))
 })
 
 func register(url, username, password, email string) {
@@ -82,6 +86,16 @@ func register(url, username, password, email string) {
 	Eventually(sess).Should(gbytes.Say("Logged in as %s", username))
 }
 
+func cancelSess(url, user, pass string) (*gexec.Session, error) {
+	lgSess, err := loginSess(url, user, pass)
+	if err != nil {
+		return nil, err
+	}
+	lgSess.Wait()
+	cmd := exec.Command("deis", "auth:cancel", fmt.Sprintf("--username=%s", user), fmt.Sprintf("--password=%s", pass), "--yes")
+	return gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
+}
+
 func cancel(url, username, password string) {
 	// log in to the account
 	login(url, username, password)
@@ -93,6 +107,11 @@ func cancel(url, username, password string) {
 	Eventually(sess).Should(gbytes.Say("Account cancelled"))
 }
 
+func loginSess(url, user, pass string) (*gexec.Session, error) {
+	cmd := exec.Command("deis", "login", url, fmt.Sprintf("--username=%s", user), fmt.Sprintf("--password=%s", pass))
+	return gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
+}
+
 func login(url, user, password string) {
 	sess, err := start("deis login %s --username=%s --password=%s", url, user, password)
 	Expect(err).To(BeNil())