Remove SkipIfI386 in testing base

SimonRichardson · SimonRichardson · commit 45101b95573f · 2023-04-25T16:58:49.000+01:00
diff --git a/core/constraints/arch_test.go b/core/constraints/arch_test.go
@@ -1,3 +1,6 @@
+// Copyright 2023 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
 package constraints
 
 import (
diff --git a/provider/dummy/environs.go b/provider/dummy/environs.go
@@ -1179,7 +1179,7 @@ func (e *environ) ConstraintsValidator(ctx context.ProviderCallContext) (constra
 	validator := constraints.NewValidator()
 	validator.RegisterUnsupported(unsupportedConstraints)
 	validator.RegisterConflicts([]string{constraints.InstanceType}, []string{constraints.Mem})
-	validator.RegisterVocabulary(constraints.Arch, []string{arch.AMD64, arch.ARM64, arch.I386, arch.PPC64EL, arch.S390X})
+	validator.RegisterVocabulary(constraints.Arch, []string{arch.AMD64, arch.ARM64, arch.PPC64EL, arch.S390X})
 	return validator, nil
 }
 
diff --git a/testing/base.go b/testing/base.go
@@ -110,13 +110,6 @@ func SkipIfPPC64EL(c *gc.C, bugID string) {
 	}
 }
 
-// SkipIfI386 skips the test if the arch is I386.
-func SkipIfI386(c *gc.C, bugID string) {
-	if arch.NormaliseArch(runtime.GOARCH) == arch.I386 {
-		c.Skip(fmt.Sprintf("Test disabled on I386 until fixed - see bug %s", bugID))
-	}
-}
-
 // SkipIfS390X skips the test if the arch is S390X.
 func SkipIfS390X(c *gc.C, bugID string) {
 	if arch.NormaliseArch(runtime.GOARCH) == arch.S390X {

Original file line number	Diff line number	Diff line change
`@@ -1179,7 +1179,7 @@ func (e *environ) ConstraintsValidator(ctx context.ProviderCallContext) (constra`
`1179`	`1179`	`validator := constraints.NewValidator()`
`1180`	`1180`	`validator.RegisterUnsupported(unsupportedConstraints)`
`1181`	`1181`	`validator.RegisterConflicts([]string{constraints.InstanceType}, []string{constraints.Mem})`
`1182`		`- validator.RegisterVocabulary(constraints.Arch, []string{arch.AMD64, arch.ARM64, arch.I386, arch.PPC64EL, arch.S390X})`
	`1182`	`+ validator.RegisterVocabulary(constraints.Arch, []string{arch.AMD64, arch.ARM64, arch.PPC64EL, arch.S390X})`
`1183`	`1183`	`return validator, nil`
`1184`	`1184`	`}`
`1185`	`1185`
Original file line number	Diff line number	Diff line change
`@@ -110,13 +110,6 @@ func SkipIfPPC64EL(c *gc.C, bugID string) {`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`-// SkipIfI386 skips the test if the arch is I386.`
`114`		`-func SkipIfI386(c *gc.C, bugID string) {`
`115`		`- if arch.NormaliseArch(runtime.GOARCH) == arch.I386 {`
`116`		`- c.Skip(fmt.Sprintf("Test disabled on I386 until fixed - see bug %s", bugID))`
`117`		`- }`
`118`		`-}`
`119`		`-`
`120`	`113`	`// SkipIfS390X skips the test if the arch is S390X.`
`121`	`114`	`func SkipIfS390X(c *gc.C, bugID string) {`
`122`	`115`	`if arch.NormaliseArch(runtime.GOARCH) == arch.S390X {`