Skip to content
This repository has been archived by the owner on Oct 17, 2018. It is now read-only.

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Skillington committed Jul 26, 2018
1 parent e9cc443 commit 8ca37c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
7 changes: 2 additions & 5 deletions metadata/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,14 @@ func (metadatas PipelineMetadatas) ApplyOrRemoveDropPolicies() (
) {
// Check drop policies
dropIfOnlyMatchPipelines := 0
firstDropIfOnlyMatchPipelineIdx := -1
nonDropPipelines := 0
for i := range metadatas {
switch metadatas[i].DropPolicy {
case policy.DropMust:
// Immediately return, result is a drop
return PipelineMetadatas{metadatas[i]}, AppliedEffectiveDropPolicyResult
return DropPipelineMetadatas, AppliedEffectiveDropPolicyResult
case policy.DropIfOnlyMatch:
dropIfOnlyMatchPipelines++
firstDropIfOnlyMatchPipelineIdx = i
continue
}
nonDropPipelines++
Expand All @@ -224,8 +222,7 @@ func (metadatas PipelineMetadatas) ApplyOrRemoveDropPolicies() (

if nonDropPipelines == 0 {
// Drop is effective as no other non drop pipelines, result is a drop
metadata := metadatas[firstDropIfOnlyMatchPipelineIdx]
return PipelineMetadatas{metadata}, AppliedEffectiveDropPolicyResult
return DropPipelineMetadatas, AppliedEffectiveDropPolicyResult
}

// Remove all non-default drop policies as they must not be effective
Expand Down
8 changes: 2 additions & 6 deletions metadata/metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1164,11 +1164,7 @@ func TestApplyOrRemoveDropPoliciesDropMust(t *testing.T) {
}
output, result := input.ApplyOrRemoveDropPolicies()
require.Equal(t, AppliedEffectiveDropPolicyResult, result)
require.True(t, output.Equal(PipelineMetadatas{PipelineMetadata{
AggregationID: aggregation.DefaultID,
StoragePolicies: nil,
DropPolicy: policy.DropMust,
}}))
require.True(t, output.Equal(DropPipelineMetadatas))
}

func TestApplyOrRemoveDropPoliciesDropIfOnlyMatchEffective(t *testing.T) {
Expand All @@ -1181,7 +1177,7 @@ func TestApplyOrRemoveDropPoliciesDropIfOnlyMatchEffective(t *testing.T) {
}
output, result := input.ApplyOrRemoveDropPolicies()
require.Equal(t, AppliedEffectiveDropPolicyResult, result)
require.True(t, output.Equal(input))
require.True(t, output.Equal(DropPipelineMetadatas))
}

func TestApplyOrRemoveDropPoliciesDropIfOnlyMatchMiddleIneffective(t *testing.T) {
Expand Down

0 comments on commit 8ca37c5

Please sign in to comment.