Use deferred acquisition consistently
This commit is contained in:
@@ -1533,9 +1533,13 @@ func TestSourceVersionImportAccountingIncludesConsumedHeaderNodes(t *testing.T)
|
||||
policy := acquisitionPolicy{importLimits: limits}
|
||||
owners := &acquisitionState{accounting: accounting, versionState: state}
|
||||
tier := &tierAcquisitionState{}
|
||||
composed, sources, foundDiagnostics := testAcquireImport(request, policy, owners, tier)
|
||||
if len(foundDiagnostics) != 0 || composed == nil || len(sources) != 2 || accounting.nodes != wantNodes || accounting.bytes != wantBytes {
|
||||
t.Fatalf("exact raw byte/node accounting = %#v, %d/%d, want %d/%d, %#v", composed, accounting.bytes, accounting.nodes, wantBytes, wantNodes, foundDiagnostics)
|
||||
acquired, sources, foundDiagnostics := testAcquireImport(request, policy, owners, tier)
|
||||
if len(foundDiagnostics) != 0 || acquired == nil || len(sources) != 2 || accounting.nodes != wantNodes || accounting.bytes != wantBytes {
|
||||
t.Fatalf("exact raw byte/node accounting = %#v, %d/%d, want %d/%d, %#v", acquired, accounting.bytes, accounting.nodes, wantBytes, wantNodes, foundDiagnostics)
|
||||
}
|
||||
composed, foundDiagnostics := testComposeAcquiredImport(request, policy, owners, acquired, sources)
|
||||
if len(foundDiagnostics) != 0 || composed == nil {
|
||||
t.Fatalf("compose acquired input = %#v, %#v", composed, foundDiagnostics)
|
||||
}
|
||||
if len(state.evidence) != 1 || state.evidence[0].sourceID != "source-2" || state.evidence[0].version.Text != "accepted" {
|
||||
t.Fatalf("acquired child evidence = %#v", state.evidence)
|
||||
@@ -1551,9 +1555,9 @@ func TestSourceVersionImportAccountingIncludesConsumedHeaderNodes(t *testing.T)
|
||||
policy.importLimits = below
|
||||
owners = &acquisitionState{accounting: accounting, versionState: &sourceVersionState{localRule: rule, effectiveRule: rule, mode: sourceVersionModeRequired}}
|
||||
tier = &tierAcquisitionState{}
|
||||
composed, _, foundDiagnostics = testAcquireImport(request, policy, owners, tier)
|
||||
if composed != nil || len(foundDiagnostics) != 1 || foundDiagnostics[0].Code != CodeImportLimitExceeded {
|
||||
t.Fatalf("raw header nodes were not charged: %#v, %#v", composed, foundDiagnostics)
|
||||
acquired, _, foundDiagnostics = testAcquireImport(request, policy, owners, tier)
|
||||
if acquired != nil || len(foundDiagnostics) != 1 || foundDiagnostics[0].Code != CodeImportLimitExceeded {
|
||||
t.Fatalf("raw header nodes were not charged: %#v, %#v", acquired, foundDiagnostics)
|
||||
}
|
||||
|
||||
below = defaultImportLimits()
|
||||
@@ -1563,9 +1567,9 @@ func TestSourceVersionImportAccountingIncludesConsumedHeaderNodes(t *testing.T)
|
||||
policy.importLimits = below
|
||||
owners = &acquisitionState{accounting: accounting, versionState: &sourceVersionState{localRule: rule, effectiveRule: rule, mode: sourceVersionModeRequired}}
|
||||
tier = &tierAcquisitionState{}
|
||||
composed, _, foundDiagnostics = testAcquireImport(request, policy, owners, tier)
|
||||
if composed != nil || len(foundDiagnostics) != 1 || foundDiagnostics[0].Code != CodeImportLimitExceeded {
|
||||
t.Fatalf("raw header bytes were not charged: %#v, %#v", composed, foundDiagnostics)
|
||||
acquired, _, foundDiagnostics = testAcquireImport(request, policy, owners, tier)
|
||||
if acquired != nil || len(foundDiagnostics) != 1 || foundDiagnostics[0].Code != CodeImportLimitExceeded {
|
||||
t.Fatalf("raw header bytes were not charged: %#v, %#v", acquired, foundDiagnostics)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user