Remove legacy party configuration
This commit is contained in:
@@ -44,7 +44,7 @@ inputs:
|
||||
if err := Validate(cfg); err != nil {
|
||||
t.Fatalf("Validate() error = %v", err)
|
||||
}
|
||||
if cfg.Party.Mode != PartyModeCanonical || cfg.Party.Canonical == nil {
|
||||
if cfg.Party.Canonical == nil {
|
||||
t.Fatalf("party = %#v, want canonical party", cfg.Party)
|
||||
}
|
||||
if got, want := cfg.Party.Source.Path, partyPath; got != want {
|
||||
@@ -56,9 +56,6 @@ inputs:
|
||||
if !bytes.Equal(cfg.Party.Canonical.Raw, partyYAML) {
|
||||
t.Fatal("canonical party bytes were not retained")
|
||||
}
|
||||
if got := cfg.StableInputs.PlayersFile; got.Source != "derived_from_party" || got.Path != "" || got.ConfigPath != "" {
|
||||
t.Fatalf("derived players input = %#v, want virtual party projection source", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCanonicalPartyRejectsSeparatePlayersAndSessionPartyOverrides(t *testing.T) {
|
||||
@@ -68,9 +65,9 @@ func TestCanonicalPartyRejectsSeparatePlayersAndSessionPartyOverrides(t *testing
|
||||
sessionExtra string
|
||||
want string
|
||||
}{
|
||||
{name: "campaign players", campaignExtra: " players_file: players.yml\n", want: "campaign.inputs.players_file is not allowed"},
|
||||
{name: "session players", sessionExtra: " players_file: players.yml\n", want: "session.inputs.players_file is not allowed"},
|
||||
{name: "session party", sessionExtra: " party_file: party-override.yml\n", want: "session.inputs.party_file cannot override"},
|
||||
{name: "campaign players", campaignExtra: " players_file: players.yml\n", want: "field players_file not found"},
|
||||
{name: "session players", sessionExtra: " players_file: players.yml\n", want: "field players_file not found"},
|
||||
{name: "session party", sessionExtra: " party_file: party-override.yml\n", want: "field party_file not found"},
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
@@ -126,15 +123,15 @@ func TestResolveAndLoadedCampaignShareCanonicalPartyResolution(t *testing.T) {
|
||||
t.Fatalf("LoadPipelineCampaign() error = %v", err)
|
||||
}
|
||||
partial, err := ResolveLoadedPipelineCampaign(loaded, "", nil, SessionSource{})
|
||||
if err != nil || partial.Party.Mode != PartyModeCanonical {
|
||||
if err != nil || partial.Party.Canonical == nil {
|
||||
t.Fatalf("ResolveLoadedPipelineCampaign() = %#v, %v; want canonical partial config", partial, err)
|
||||
}
|
||||
direct, err := Resolve(pipelinePath, pipeline, campaignPath, campaign, sessionPath, session, SessionSource{Source: "session_config", LocalPath: sessionPath})
|
||||
if err != nil {
|
||||
t.Fatalf("Resolve() error = %v", err)
|
||||
}
|
||||
if direct.Party.Mode != PartyModeCanonical || direct.StableInputs.PlayersFile.Source != "derived_from_party" {
|
||||
t.Fatalf("Resolve() party = %#v, players = %#v", direct.Party, direct.StableInputs.PlayersFile)
|
||||
if direct.Party.Canonical == nil {
|
||||
t.Fatalf("Resolve() party = %#v", direct.Party)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user