Consolidate import request ownership
This commit is contained in:
@@ -1523,9 +1523,11 @@ func TestSourceVersionImportAccountingIncludesConsumedHeaderNodes(t *testing.T)
|
||||
limits.nodes = wantNodes
|
||||
|
||||
accounting := &importAccounting{}
|
||||
composed, sources, foundDiagnostics := loadImportedDocumentsTrackedWithVersion(
|
||||
File(mainPath), nil, main, Path{}, rule, limits, accounting, nil, nil, state,
|
||||
)
|
||||
request := testImportRequest(File(mainPath), nil, main, Path{}, rule, nil)
|
||||
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)
|
||||
}
|
||||
@@ -1539,10 +1541,11 @@ func TestSourceVersionImportAccountingIncludesConsumedHeaderNodes(t *testing.T)
|
||||
below := defaultImportLimits()
|
||||
below.nodes = wantNodes - 1
|
||||
accounting = &importAccounting{}
|
||||
composed, _, foundDiagnostics = loadImportedDocumentsTrackedWithVersion(
|
||||
File(mainPath), nil, main, Path{}, rule, below, accounting, nil, nil,
|
||||
&sourceVersionState{localRule: rule, effectiveRule: rule, mode: sourceVersionModeRequired},
|
||||
)
|
||||
request = testImportRequest(File(mainPath), nil, main, Path{}, rule, nil)
|
||||
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)
|
||||
}
|
||||
@@ -1550,10 +1553,11 @@ func TestSourceVersionImportAccountingIncludesConsumedHeaderNodes(t *testing.T)
|
||||
below = defaultImportLimits()
|
||||
below.bytes = wantBytes - 1
|
||||
accounting = &importAccounting{}
|
||||
composed, _, foundDiagnostics = loadImportedDocumentsTrackedWithVersion(
|
||||
File(mainPath), nil, main, Path{}, rule, below, accounting, nil, nil,
|
||||
&sourceVersionState{localRule: rule, effectiveRule: rule, mode: sourceVersionModeRequired},
|
||||
)
|
||||
request = testImportRequest(File(mainPath), nil, main, Path{}, rule, nil)
|
||||
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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user