Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pipeline: Fixed labels process test with same objects #869

Merged
merged 2 commits into from
Aug 8, 2019

Conversation

jojohappy
Copy link
Contributor

Signed-off-by: jojohappy [email protected]

What this PR does / why we need it:
Fixed the labels test to compare the same excepted objects.

@CLAassistant
Copy link

CLAassistant commented Aug 8, 2019

CLA assistant check
All committers have signed the CLA.

@@ -158,7 +158,7 @@ func TestLabelStage_Process(t *testing.T) {
t.Fatal(err)
}
st.Process(test.inputLabels, test.extractedData, nil, nil)
assert.Equal(t, test.expectedLabels, test.expectedLabels)
assert.Equal(t, test.inputLabels, test.expectedLabels)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you swap these around?

func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{})

So that test.expectedLabels is first and test.inputLabels is second, this will make any failure messages a little easier to understand.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@slim-bean
Copy link
Collaborator

Yikes! good catch! One little nit and we'll get this merged!

@jojohappy
Copy link
Contributor Author

@slim-bean Thanks for your review!

@slim-bean slim-bean merged commit 3d1f39f into grafana:master Aug 8, 2019
@jojohappy jojohappy deleted the fix_labels_test branch August 8, 2019 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants