Revert "Test fixes"

This reverts commit efdd300.
sdg0919 · Nov 16, 2020 · dd577df · dd577df
1 parent 1ac0e46
commit dd577df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/provider/common/errors_test.go b/provider/common/errors_test.go
@@ -29,9 +29,9 @@ func (*ErrorsSuite) TestWrapZoneIndependentError(c *gc.C) {
 
 	stack := errors.ErrorStack(wrapped)
 	c.Assert(stack, gc.Matches, `
-.*/provider/common/errors_test.go:.*: foo
-.*/provider/common/errors_test.go:.*: bar
-.*/provider/common/errors_test.go:.*: bar: foo`[1:])
+.*/juju/juju/provider/common/errors_test.go:.*: foo
+.*/juju/juju/provider/common/errors_test.go:.*: bar
+.*/juju/juju/provider/common/errors_test.go:.*: bar: foo`[1:])
 }
 
 func (s *ErrorsSuite) TestInvalidCredentialWrapped(c *gc.C) {
@@ -46,9 +46,9 @@ func (s *ErrorsSuite) TestInvalidCredentialWrapped(c *gc.C) {
 
 	stack := errors.ErrorStack(err)
 	c.Assert(stack, gc.Matches, `
-.*/provider/common/errors_test.go:.*: foo
-.*/provider/common/errors_test.go:.*: bar
-.*/provider/common/errors_test.go:.*: bar: foo`[1:])
+.*/juju/juju/provider/common/errors_test.go:.*: foo
+.*/juju/juju/provider/common/errors_test.go:.*: bar
+.*/juju/juju/provider/common/errors_test.go:.*: bar: foo`[1:])
 }
 
 func (s *ErrorsSuite) TestInvalidCredentialNew(c *gc.C) {

diff --git a/provider/ec2/image_test.go b/provider/ec2/image_test.go
@@ -285,7 +285,7 @@ var findInstanceSpecErrorTests = []struct {
 	{
 		series: version.DefaultSupportedLTS(),
 		arches: []string{"arm"},
-		err:    fmt.Sprintf(`no metadata for "%s" images in test with arches \[arm\]`, version.DefaultSupportedLTS()),
+		err:    fmt.Sprintf(`no "%s" images in test with arches \[arm\]`, version.DefaultSupportedLTS()),
 	}, {
 		series: "raring",
 		arches: []string{"amd64", "i386"},

diff --git a/provider/openstack/local_test.go b/provider/openstack/local_test.go
@@ -1643,7 +1643,7 @@ func (s *localServerSuite) TestPrecheckInstanceAvailZone(c *gc.C) {
 func (s *localServerSuite) TestPrecheckInstanceAvailZoneUnavailable(c *gc.C) {
 	placement := "zone=test-unavailable"
 	err := s.env.PrecheckInstance(s.callCtx, environs.PrecheckInstanceParams{Series: jujuversion.DefaultSupportedLTS(), Placement: placement})
-	c.Assert(err, gc.ErrorMatches, `availability zone "test-unavailable" is unavailable`)
+	c.Assert(err, gc.ErrorMatches, `zone "test-unavailable" is unavailable`)
 }
 
 func (s *localServerSuite) TestPrecheckInstanceAvailZoneUnknown(c *gc.C) {