From 26d1c5e22036bf115392cdbd0626182a0e8992e2 Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Thu, 6 Apr 2017 09:21:15 -0400 Subject: [PATCH] migrations: Clean up main_test file Fix merge skew and remove unnecessary bits. --- pkg/migrations/main_test.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/migrations/main_test.go b/pkg/migrations/main_test.go index ad7a62ddfb63..65cb905ea747 100644 --- a/pkg/migrations/main_test.go +++ b/pkg/migrations/main_test.go @@ -12,22 +12,15 @@ // implied. See the License for the specific language governing // permissions and limitations under the License. -package migrations_test +package migrations import ( - "os" - "testing" - "github.com/cockroachdb/cockroach/pkg/security" "github.com/cockroachdb/cockroach/pkg/security/securitytest" - "github.com/cockroachdb/cockroach/pkg/server" - "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" ) -func TestMain(m *testing.M) { - security.SetReadFileFn(securitytest.Asset) - serverutils.InitTestServerFactory(server.TestServerFactory) - os.Exit(m.Run()) +func init() { + security.SetAssetLoader(securitytest.EmbeddedAssets) } //go:generate ../util/leaktest/add-leaktest.sh *_test.go