Skip to content

Commit

Permalink
Merge pull request cockroachdb#14665 from a-robinson/main
Browse files Browse the repository at this point in the history
migrations: Clean up main_test file
  • Loading branch information
a-robinson authored Apr 6, 2017
2 parents c647366 + 26d1c5e commit 657985d
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions pkg/migrations/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 657985d

Please sign in to comment.