-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Fix time.Time not equals bug #951
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for your contribution. You still need to run go generate
as I don't see the auto-generated files in this PR.
I also think you have made some mistake with the _codegen
sub-module as there have been changes to its module files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for your time and effort. This looks great now :)
I've had to fix the TravisCI config. Do you mind rebasing the branch and then I can merge it? |
Of course I do not mind |
I can merge the master in my branch pulling up new changes |
Thank you, there still seem to be some conflicts, do you mind having a look again? |
Sorry, upstream has not been updated. The last commit pulled all the changes from testify |
Thanks in advance for the opportunity to contribute)) |
Hi, very sorry, I was very busy. I merge the latest changes from master to my branch. Unfortunately, the commits could not be squashed, I'm afraid to do a hard push or rebase |
If you rebase, resolve any conflicts and then force-push your branch you should be fine. We can't merge this PR while there are conflicts :) |
Please show me in which files the conflicts occur, I will solve them locally, because I still don't understand a little how and where I can rebase and force-push |
should i rebase my branch to master? |
Yes, you'd rebase on
where This is a good and thorough guide on the general flow: https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/ |
Adding test
This commit adds wrapper functions for Is and As functions from the errors package.
81c8dc9
to
59973ec
Compare
I did rebase and force-push, as you asked |
Should we close this given that #979 fixed the git history issue? |
Adding test
Summary
Fix assert.ObjectsAreEqual bug with not equals time.Time before and after serializing\deserializing
Changes
Added a check in ObectsAreEqual in case the arguments are a time object
Motivation
Fix bug to use test in docker
Related issues
Closes #950