From 918776629aab1a205aec0ea44118f1f81b99b9f3 Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Sat, 17 Sep 2016 02:37:47 +0000
Subject: [PATCH] Fix osadm manage-node --schedulable

---
 pkg/cmd/admin/node/schedulable.go | 5 +++--
 test/cmd/admin.sh                 | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/cmd/admin/node/schedulable.go b/pkg/cmd/admin/node/schedulable.go
index 993e204126f4..0502e2d20bfa 100644
--- a/pkg/cmd/admin/node/schedulable.go
+++ b/pkg/cmd/admin/node/schedulable.go
@@ -19,9 +19,10 @@ func (s *SchedulableOptions) Run() error {
 
 	errList := []error{}
 	var printer kubectl.ResourcePrinter
+	unschedulable := !s.Schedulable
 	for _, node := range nodes {
-		if node.Spec.Unschedulable == !s.Schedulable {
-			node.Spec.Unschedulable = !s.Schedulable
+		if node.Spec.Unschedulable != unschedulable {
+			node.Spec.Unschedulable = unschedulable
 			node, err = s.Options.Kclient.Nodes().Update(node)
 			if err != nil {
 				errList = append(errList, err)
diff --git a/test/cmd/admin.sh b/test/cmd/admin.sh
index b67ab0ef3ed2..72d65cfff855 100755
--- a/test/cmd/admin.sh
+++ b/test/cmd/admin.sh
@@ -71,7 +71,8 @@ status:
 ' | oc create -f -"
 
 os::cmd::expect_success_and_text 'oadm manage-node --selector= --schedulable=true' 'Ready'
-os::cmd::expect_success_and_not_text 'oadm manage-node --selector= --schedulable=true' 'Sched'
+os::cmd::expect_success_and_not_text 'oadm manage-node --selector= --schedulable=true' 'SchedulingDisabled'
+os::cmd::expect_success_and_text 'oadm manage-node --selector= --schedulable=false' 'SchedulingDisabled'
 echo "manage-node: ok"
 os::test::junit::declare_suite_end