From 1cad7910376ed43a745a9f23325a79033589c607 Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Wed, 17 Feb 2016 08:26:51 -0500
Subject: [PATCH] remove testing symlink

---
 pkg/cmd/cli/secrets/bsFixtures/dir/symbolic |  1 -
 pkg/cmd/cli/secrets/new_test.go             | 21 ++++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)
 delete mode 120000 pkg/cmd/cli/secrets/bsFixtures/dir/symbolic

diff --git a/pkg/cmd/cli/secrets/bsFixtures/dir/symbolic b/pkg/cmd/cli/secrets/bsFixtures/dir/symbolic
deleted file mode 120000
index 945c9b46d684..000000000000
--- a/pkg/cmd/cli/secrets/bsFixtures/dir/symbolic
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/pkg/cmd/cli/secrets/new_test.go b/pkg/cmd/cli/secrets/new_test.go
index 7ba96b6eacee..9fcacd3fcfb7 100644
--- a/pkg/cmd/cli/secrets/new_test.go
+++ b/pkg/cmd/cli/secrets/new_test.go
@@ -1,7 +1,9 @@
 package secrets
 
 import (
+	"bytes"
 	"io/ioutil"
+	"os"
 	"testing"
 
 	kapi "k8s.io/kubernetes/pkg/api"
@@ -40,11 +42,16 @@ func TestValidate(t *testing.T) {
 }
 
 func TestCreateSecret(t *testing.T) {
+	os.Symlink(".", "./bsFixtures/dir/symbolic")
+	defer os.Remove("./bsFixtures/dir/symbolic")
+
 	tests := []struct {
 		testName string
 		args     []string
 		expErr   bool
 		quiet    bool
+
+		errStreamContent string
 	}{
 		{
 			testName: "validSources",
@@ -70,9 +77,9 @@ func TestCreateSecret(t *testing.T) {
 			quiet:    true,
 		},
 		{
-			testName: "testQuietFalse",
-			args:     []string{"testSecret", "./bsFixtures/dir"},
-			expErr:   true, // "Skipping resource <resource path>"
+			testName:         "testQuietFalse",
+			args:             []string{"testSecret", "./bsFixtures/dir"},
+			errStreamContent: "Skipping resource bsFixtures/dir/symbolic\n",
 		},
 		{
 			testName: "testNamedKeys",
@@ -116,7 +123,9 @@ func TestCreateSecret(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
+		errStream := &bytes.Buffer{}
 		options := NewCreateSecretOptions()
+		options.Stderr = errStream
 		options.Complete(test.args, nil)
 		options.Quiet = test.quiet
 
@@ -128,6 +137,12 @@ func TestCreateSecret(t *testing.T) {
 		if err != nil && !test.expErr {
 			t.Errorf("%s: unexpected error: %s", test.testName, err)
 		}
+		if err == nil && test.expErr {
+			t.Errorf("%s: missing expected error", test.testName)
+		}
+		if string(errStream.Bytes()) != test.errStreamContent {
+			t.Errorf("%s: expected %s, got %v", test.testName, test.errStreamContent, string(errStream.Bytes()))
+		}
 	}
 }