Fix the other tests.

Author: howbazaar

cmd/juju/block/disablecommand.go

@@ -84,7 +84,7 @@ Examples:
     juju disable-command destroy-model "Check with SA before destruction."
 
     # To prevent the machines, applications, units and relations from being removed:
-    juju disable-command remove-object 
+    juju disable-command remove-object
 
     # To prevent changes to the model:
     juju disable-command all "Model locked down"

cmd/juju/commands/main_test.go

@@ -23,7 +23,6 @@ import (
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/cmd/juju/application"
-	"github.com/juju/juju/cmd/juju/block"
 	"github.com/juju/juju/cmd/juju/cloud"
 	"github.com/juju/juju/cmd/modelcmd"
 	cmdtesting "github.com/juju/juju/cmd/testing"
@@ -52,10 +51,6 @@ func syncToolsHelpText() string {
 	return cmdtesting.HelpText(newSyncToolsCommand(), "juju sync-tools")
 }
 
-func blockHelpText() string {
-	return cmdtesting.HelpText(block.NewSuperBlockCommand(), "juju block")
-}
-
 func (s *MainSuite) TestRunMain(c *gc.C) {
 	// The test array structure needs to be inline here as some of the
 	// expected values below use deployHelpText().  This constructs the deploy
@@ -132,18 +127,7 @@ func (s *MainSuite) TestRunMain(c *gc.C) {
 			Arch:   arch.HostArch(),
 			Series: series.HostSeries(),
 		}.String() + "\n",
-	}, {
-		summary: "check block command registered properly",
-		args:    []string{"block", "-h"},
-		code:    0,
-		out:     blockHelpText(),
-	}, {
-		summary: "check unblock command registered properly",
-		args:    []string{"unblock"},
-		code:    0,
-		out:     "error: must specify one of [destroy-model | remove-object | all-changes] to unblock\n",
-	},
-	} {
+	}} {
 		c.Logf("test %d: %s", i, t.summary)
 		out := badrun(c, t.code, t.args...)
 		c.Assert(out, gc.Equals, t.out)
@@ -418,7 +402,6 @@ var commandNames = []string{
 	"allocate",
 	"autoload-credentials",
 	"backups",
-	"block",
 	"bootstrap",
 	"budgets",
 	"cached-images",
@@ -437,9 +420,12 @@ var commandNames = []string{
 	"deploy",
 	"destroy-controller",
 	"destroy-model",
+	"disable-command",
 	"disable-user",
+	"disabled-commands",
 	"download-backup",
 	"enable-ha",
+	"enable-command",
 	"enable-user",
 	"expose",
 	"get-config",
@@ -455,13 +441,13 @@ var commandNames = []string{
 	"kill-controller",
 	"list-actions",
 	"list-agreements",
-	"list-all-blocks",
 	"list-backups",
 	"list-budgets",
 	"list-cached-images",
 	"list-clouds",
 	"list-controllers",
 	"list-credentials",
+	"list-disabled-commands",
 	"list-machines",
 	"list-models",
 	"list-plans",
@@ -531,7 +517,6 @@ var commandNames = []string{
 	"subnets",
 	"switch",
 	"sync-tools",
-	"unblock",
 	"unexpose",
 	"update-allocation",
 	"upload-backup",

cmd/juju/commands/run_test.go

@@ -277,7 +277,7 @@ func (s *RunSuite) TestBlockRunForMachineAndUnit(c *gc.C) {
 	c.Assert(err, gc.ErrorMatches, cmd.ErrSilent.Error())
 	// msg is logged
 	stripped := strings.Replace(c.GetTestLog(), "\n", "", -1)
-	c.Check(stripped, gc.Matches, ".*To unblock changes.*")
+	c.Check(stripped, gc.Matches, ".*To enable changes.*")
 }
 
 func (s *RunSuite) TestAllMachines(c *gc.C) {
@@ -337,7 +337,7 @@ func (s *RunSuite) TestBlockAllMachines(c *gc.C) {
 	c.Assert(err, gc.ErrorMatches, cmd.ErrSilent.Error())
 	// msg is logged
 	stripped := strings.Replace(c.GetTestLog(), "\n", "", -1)
-	c.Check(stripped, gc.Matches, ".*To unblock changes.*")
+	c.Check(stripped, gc.Matches, ".*To enable changes.*")
 }
 
 func (s *RunSuite) TestSingleResponse(c *gc.C) {

cmd/juju/commands/sshkeys_test.go

@@ -52,7 +52,7 @@ func (s *SSHKeysSuite) TestHelpImport(c *gc.C) {
 
 type keySuiteBase struct {
 	jujutesting.JujuConnSuite
-	jujutesting.CmdBlockHelper
+	coretesting.CmdBlockHelper
 }
 
 func (s *keySuiteBase) SetUpSuite(c *gc.C) {
@@ -62,7 +62,7 @@ func (s *keySuiteBase) SetUpSuite(c *gc.C) {
 
 func (s *keySuiteBase) SetUpTest(c *gc.C) {
 	s.JujuConnSuite.SetUpTest(c)
-	s.CmdBlockHelper = jujutesting.NewCmdBlockHelper(s.APIState)
+	s.CmdBlockHelper = coretesting.NewCmdBlockHelper(s.APIState)
 	c.Assert(s.CmdBlockHelper, gc.NotNil)
 	s.AddCleanup(func(*gc.C) { s.CmdBlockHelper.Close() })
 }

cmd/juju/commands/upgradejuju_test.go

@@ -820,7 +820,7 @@ func (s *UpgradeJujuSuite) TestBlockUpgradeInProgress(c *gc.C) {
 	// Block operation
 	s.BlockAllChanges(c, "TestBlockUpgradeInProgress")
 	err = modelcmd.Wrap(cmd).Run(coretesting.Context(c))
-	s.AssertBlocked(c, err, ".*To unblock changes.*")
+	s.AssertBlocked(c, err, ".*To enable changes.*")
 }
 
 func (s *UpgradeJujuSuite) TestResetPreviousUpgrade(c *gc.C) {

cmd/juju/common/controller.go

@@ -62,8 +62,13 @@ var (
 	blockAPI                = getBlockAPI
 )
 
+type listBlocksAPI interface {
+	List() ([]params.Block, error)
+	Close() error
+}
+
 // getBlockAPI returns a block api for listing blocks.
-func getBlockAPI(c *modelcmd.ModelCommandBase) (*block.Client, error) {
+func getBlockAPI(c *modelcmd.ModelCommandBase) (listBlocksAPI, error) {
 	root, err := c.NewAPIRoot()
 	if err != nil {
 		return nil, errors.Trace(err)

cmd/juju/common/controller_test.go

@@ -12,7 +12,6 @@ import (
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/apiserver/params"
-	"github.com/juju/juju/cmd/juju/block"
 	"github.com/juju/juju/cmd/modelcmd"
 	cmdtesting "github.com/juju/juju/cmd/testing"
 	"github.com/juju/juju/jujuclient/jujuclienttesting"
@@ -30,7 +29,7 @@ type controllerSuite struct {
 
 func (s *controllerSuite) SetUpTest(c *gc.C) {
 	s.mockBlockClient = &mockBlockClient{}
-	s.PatchValue(&blockAPI, func(*modelcmd.ModelCommandBase) (block.BlockListAPI, error) {
+	s.PatchValue(&blockAPI, func(*modelcmd.ModelCommandBase) (listBlocksAPI, error) {
 		err := s.mockBlockClient.loginError
 		if err != nil {
 			s.mockBlockClient.loginError = nil

cmd/juju/model/destroy_test.go

@@ -193,5 +193,5 @@ func (s *DestroySuite) TestDestroyCommandConfirmation(c *gc.C) {
 func (s *DestroySuite) TestBlockedDestroy(c *gc.C) {
 	s.api.err = &params.Error{Code: params.CodeOperationBlocked}
 	s.runDestroyCommand(c, "test2", "-y")
-	c.Check(c.GetTestLog(), jc.Contains, "To remove the block")
+	c.Check(c.GetTestLog(), jc.Contains, "To enable the command")
 }

cmd/juju/model/grantrevoke_test.go

@@ -85,7 +85,7 @@ func (s *grantRevokeSuite) TestBlockGrant(c *gc.C) {
 	s.fake.err = &params.Error{Code: params.CodeOperationBlocked}
 	_, err := s.run(c, "sam", "read", "foo")
 	c.Assert(err, gc.Equals, cmd.ErrSilent)
-	c.Check(c.GetTestLog(), jc.Contains, "To unblock changes")
+	c.Check(c.GetTestLog(), jc.Contains, "To enable changes")
 }
 
 type grantSuite struct {

cmd/juju/user/add_test.go

@@ -128,7 +128,7 @@ func (s *UserAddCommandSuite) TestBlockAddUser(c *gc.C) {
 	c.Assert(err, gc.ErrorMatches, cmd.ErrSilent.Error())
 	// msg is logged
 	stripped := strings.Replace(c.GetTestLog(), "\n", "", -1)
-	c.Check(stripped, gc.Matches, ".*To unblock changes.*")
+	c.Check(stripped, gc.Matches, ".*To enable changes.*")
 }
 
 func (s *UserAddCommandSuite) TestAddUserErrorResponse(c *gc.C) {

featuretests/block_test.go

@@ -4,13 +4,11 @@
 package featuretests
 
 import (
-	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/api/block"
 	jujutesting "github.com/juju/juju/juju/testing"
-	"github.com/juju/juju/state"
 )
 
 type blockSuite struct {
@@ -32,8 +30,3 @@ func (s *blockSuite) TestBlockFacadeCall(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(found, gc.HasLen, 0)
 }
-
-func (s *blockSuite) TestBlockFacadeCallGettingErrors(c *gc.C) {
-	err := s.blockClient.SwitchBlockOff(state.DestroyBlock.String())
-	c.Assert(errors.Cause(err), gc.ErrorMatches, `.*is already OFF.*`)
-}

featuretests/cmd_juju_controller_test.go

@@ -4,10 +4,8 @@
 package featuretests
 
 import (
-	"fmt"
 	"os"
 	"reflect"
-	"strings"
 	"time"
 
 	"github.com/juju/cmd"
@@ -299,18 +297,6 @@ func (s *cmdControllerSuite) TestControllerKill(c *gc.C) {
 	c.Assert(err, jc.Satisfies, errors.IsNotFound)
 }
 
-func (s *cmdControllerSuite) TestListBlocks(c *gc.C) {
-	s.State.SwitchBlockOn(state.DestroyBlock, "TestBlockDestroyModel")
-	s.State.SwitchBlockOn(state.ChangeBlock, "TestChangeBlock")
-
-	ctx := s.run(c, "list-all-blocks", "--format", "json")
-	expected := fmt.Sprintf(`[{"name":"controller","model-uuid":"%s","owner-tag":"%s","blocks":["BlockDestroy","BlockChange"]}]`,
-		s.State.ModelUUID(), s.AdminUserTag(c).String())
-
-	strippedOut := strings.Replace(testing.Stdout(ctx), "\n", "", -1)
-	c.Check(strippedOut, gc.Equals, expected)
-}
-
 func (s *cmdControllerSuite) TestSystemKillCallsEnvironDestroyOnHostedEnviron(c *gc.C) {
 	st := s.Factory.MakeModel(c, &factory.ModelParams{
 		Name: "foo",