fix: cleanup tests dropping v6+v7 client facade

Author: hpidcock

api/connection_test.go

@@ -67,7 +67,7 @@ func (s *connectionSuite) apiConnection() api.Connection {
 		},
 		Facades: []params.FacadeVersions{{
 			Name:     "Client",
-			Versions: []int{1, 2, 3, 4, 5, 6},
+			Versions: []int{1, 2, 3, 4, 5, 6, 7, 8},
 		}},
 	}
 
@@ -220,7 +220,7 @@ func (s *connectionSuite) TestBestFacadeVersion(c *gc.C) {
 	apiConn := s.apiConnection()
 	err := apiConn.Login(context.Background(), names.NewUserTag("admin"), jujutesting.AdminSecret, "", nil)
 	c.Assert(err, jc.ErrorIsNil)
-	c.Check(apiConn.BestFacadeVersion("Client"), gc.Equals, 6)
+	c.Check(apiConn.BestFacadeVersion("Client"), gc.Equals, 8)
 }
 
 func (s *connectionSuite) TestAPIHostPortsMovesConnectedValueFirst(c *gc.C) {

apiserver/admin_test.go

@@ -50,7 +50,7 @@ import (
 )
 
 const (
-	clientFacadeVersion           = 6
+	clientFacadeVersion           = 8
 	machineManagerFacadeVersion   = 11
 	sshClientFacadeVersion        = 4
 	pingerFacadeVersion           = 1

apiserver/facadeversions_test.go

@@ -64,8 +64,8 @@ func (s *facadeVersionSuite) TestClientSupport(c *gc.C) {
 	}{
 		{
 			facadeName:       "Client",
-			summary:          "Ensure that the Client facade supports 3.x for status requests",
-			apiClientVersion: []int{6},
+			summary:          "Ensure that the Client facade supports 3.6+ for status requests",
+			apiClientVersion: []int{8},
 		},
 		{
 			facadeName:       "ModelManager",

apiserver/restricted_root_test.go

@@ -23,21 +23,24 @@ var _ = gc.Suite(&restrictedRootSuite{})
 func (r *restrictedRootSuite) SetUpTest(c *gc.C) {
 	r.BaseSuite.SetUpTest(c)
 	r.root = apiserver.TestingRestrictedRoot(func(facade, method string) error {
-		if facade == "Client" && method == "FullStatus" {
-			return errors.New("blam")
-		}
 		return nil
 	})
 }
 
 func (r *restrictedRootSuite) TestAllowedMethod(c *gc.C) {
-	caller, err := r.root.FindMethod("Client", 6, "WatchAll")
+	caller, err := r.root.FindMethod("Client", 8, "FullStatus")
 	c.Check(err, jc.ErrorIsNil)
 	c.Check(caller, gc.NotNil)
 }
 
 func (r *restrictedRootSuite) TestDisallowedMethod(c *gc.C) {
-	caller, err := r.root.FindMethod("Client", 6, "FullStatus")
+	r.root = apiserver.TestingRestrictedRoot(func(facade, method string) error {
+		if facade == "Client" && method == "FullStatus" {
+			return errors.New("blam")
+		}
+		return nil
+	})
+	caller, err := r.root.FindMethod("Client", 8, "FullStatus")
 	c.Assert(err, gc.ErrorMatches, "blam")
 	c.Assert(caller, gc.IsNil)
 }
@@ -55,7 +58,7 @@ func (r *restrictedRootSuite) TestNonExistentFacade(c *gc.C) {
 }
 
 func (r *restrictedRootSuite) TestNonExistentMethod(c *gc.C) {
-	caller, err := r.root.FindMethod("Client", 6, "Bar")
-	c.Assert(err, gc.ErrorMatches, `unknown method "Bar" at version 6 for facade type "Client"`)
+	caller, err := r.root.FindMethod("Client", 8, "Bar")
+	c.Assert(err, gc.ErrorMatches, `unknown method "Bar" at version 8 for facade type "Client"`)
 	c.Assert(caller, gc.IsNil)
 }