From 8ca37c5df882443fccb47c39eb1e91faf036f02b Mon Sep 17 00:00:00 2001
From: Rob Skillington <r@uber.com>
Date: Thu, 26 Jul 2018 13:55:29 -0400
Subject: [PATCH] Fix tests

---
 metadata/metadata.go      | 7 ++-----
 metadata/metadata_test.go | 8 ++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/metadata/metadata.go b/metadata/metadata.go
index 7c7605f..1df1aaa 100644
--- a/metadata/metadata.go
+++ b/metadata/metadata.go
@@ -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++
@@ -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
diff --git a/metadata/metadata_test.go b/metadata/metadata_test.go
index c5f3fbf..e43db27 100644
--- a/metadata/metadata_test.go
+++ b/metadata/metadata_test.go
@@ -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) {
@@ -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) {