Skip to content

Commit

Permalink
tests: update for new experimental spec
Browse files Browse the repository at this point in the history
  • Loading branch information
madhu-pillai authored and travier committed Oct 14, 2024
1 parent c6c5292 commit 1f51620
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
8 changes: 4 additions & 4 deletions tests/negative/general/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func init() {
register.Register(register.NegativeTest, AppendConfigWithInvalidHeaderHTTP())
register.Register(register.NegativeTest, AppendConfigWithMissingFileTFTP())
register.Register(register.NegativeTest, VersionOnlyConfig25())
register.Register(register.NegativeTest, VersionOnlyConfig35())
register.Register(register.NegativeTest, VersionOnlyConfig36())
register.Register(register.NegativeTest, MergingCanFail())
}

Expand Down Expand Up @@ -280,13 +280,13 @@ func VersionOnlyConfig25() types.Test {
}
}

func VersionOnlyConfig35() types.Test {
name := "config.versions.3.6.0-exp"
func VersionOnlyConfig36() types.Test {
name := "config.versions.3.7.0-exp"
in := types.GetBaseDisk()
out := in
config := `{
"ignition": {
"version": "3.6.0-experimental"
"version": "3.7.0-experimental"
}
}`

Expand Down
5 changes: 3 additions & 2 deletions tests/register/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import (
types32 "github.com/coreos/ignition/v2/config/v3_2/types"
types33 "github.com/coreos/ignition/v2/config/v3_3/types"
types34 "github.com/coreos/ignition/v2/config/v3_4/types"
types_exp "github.com/coreos/ignition/v2/config/v3_5_experimental/types"
types35 "github.com/coreos/ignition/v2/config/v3_5/types"
types_exp "github.com/coreos/ignition/v2/config/v3_6_experimental/types"
"github.com/coreos/ignition/v2/tests/types"
)

Expand Down Expand Up @@ -50,7 +51,7 @@ func Register(tType TestType, t types.Test) {
{semver.Version{}}, // place holder 0
{semver.Version{}}, // place holder 1
{semver.Version{}}, // place holder 2
{types30.MaxVersion, types31.MaxVersion, types32.MaxVersion, types33.MaxVersion, types34.MaxVersion, types_exp.MaxVersion},
{types30.MaxVersion, types31.MaxVersion, types32.MaxVersion, types33.MaxVersion, types34.MaxVersion, types35.MaxVersion, types_exp.MaxVersion},
}

test := types.DeepCopy(t)
Expand Down
2 changes: 1 addition & 1 deletion tests/servers/servers.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func headerCheck(w http.ResponseWriter, r *http.Request) {
headers := map[string]string{
"X-Auth": "r8ewap98gfh4d8",
"Keep-Alive": "300",
"Accept": "application/vnd.coreos.ignition+json;version=3.4.0, */*;q=0.1",
"Accept": "application/vnd.coreos.ignition+json;version=3.5.0, */*;q=0.1",
"Accept-Encoding": "identity",
}

Expand Down

0 comments on commit 1f51620

Please sign in to comment.