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

migrations: Clean up main_test file #14665

Merged
merged 1 commit into from
Apr 6, 2017
Merged

Conversation

a-robinson
Copy link
Contributor

Maybe this messiness influenced the weird failure in #14655?

Fixes #14655

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Fix merge skew and remove unnecessary bits.
@mberhault
Copy link
Contributor

definitely LGTM for the security assets part since it wouldn't even build.
Not sure about the other part though.

@a-robinson
Copy link
Contributor Author

The idea is to more closely match the main_test.go file to rpc/main_test.go (another package that the server package depends on) and put main_test.go into the same package as migration_test.go. I think this is how it should have been in the first place.

@mberhault
Copy link
Contributor

ok. LGTM on this bit too.

@mberhault
Copy link
Contributor

I'm not sure what's going on with the check failures though.

@tamird
Copy link
Contributor

tamird commented Apr 6, 2017

This builder looks borked. Did someone run a build with an ancient builder image?

@a-robinson
Copy link
Contributor Author

How do we reset it?

@a-robinson a-robinson merged commit 657985d into cockroachdb:master Apr 6, 2017
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.

4 participants