Merge pull request #2393 from bacongobbler/drink_of_choice

feat(client): optional drink of choice

Author: Matthew Fisher

client/deis.py

@@ -1448,7 +1448,9 @@ def ps_scale(self, args):
         for type_num in args.get('<type>=<num>'):
             typ, count = type_num.split('=')
             body.update({typ: int(count)})
-        sys.stdout.write('Scaling processes... but first, coffee!\n')
+        scaling_cmd = 'Scaling processes... but first, {}!\n'.format(
+            os.environ.get('DEIS_DRINK_OF_CHOICE', 'coffee'))
+        sys.stdout.write(scaling_cmd)
         sys.stdout.flush()
         try:
             progress = TextProgress()

tests/ps_test.go

@@ -3,6 +3,7 @@
 package tests
 
 import (
+	"os"
 	"os/exec"
 	"strings"
 	"testing"
@@ -22,6 +23,12 @@ func TestPs(t *testing.T) {
 	psListTest(t, params, false)
 	utils.AppsDestroyTest(t, params)
 	utils.Execute(t, psScaleCmd, params, true, "404 NOT FOUND")
+	// ensure we can choose our preferred beverage
+	utils.Execute(t, psScaleCmd, params, true, "but first, coffee!")
+	if err := os.Setenv("DEIS_DRINK_OF_CHOICE", "tea"); err != nil {
+		t.Fatal(err)
+	}
+	utils.Execute(t, psScaleCmd, params, true, "but first, tea!")
 }
 
 func psSetup(t *testing.T) *utils.DeisTestConfig {