From 3d6dbcfc7bc0aed9835c8fa29101213b7de8db83 Mon Sep 17 00:00:00 2001 From: Matthew Jaffee Date: Wed, 30 Aug 2017 10:36:28 -0500 Subject: [PATCH] use context everywhere instead of golang.org version --- ctl/export_test.go | 2 +- ctl/import_test.go | 2 +- ctl/restore_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctl/export_test.go b/ctl/export_test.go index 433078374..4f9d9b184 100644 --- a/ctl/export_test.go +++ b/ctl/export_test.go @@ -16,13 +16,13 @@ package ctl import ( "bytes" + "context" "net/http" "strings" "testing" "github.com/pilosa/pilosa" "github.com/pilosa/pilosa/test" - "golang.org/x/net/context" ) func TestExportCommand_Validation(t *testing.T) { diff --git a/ctl/import_test.go b/ctl/import_test.go index 8c4d3793e..dd9eba675 100644 --- a/ctl/import_test.go +++ b/ctl/import_test.go @@ -16,6 +16,7 @@ package ctl import ( "bytes" + "context" "io" "io/ioutil" "net/http" @@ -24,7 +25,6 @@ import ( "github.com/pilosa/pilosa" "github.com/pilosa/pilosa/test" - "golang.org/x/net/context" ) func TestImportCommand_Validation(t *testing.T) { diff --git a/ctl/restore_test.go b/ctl/restore_test.go index 5fd5af1d8..39ac92388 100644 --- a/ctl/restore_test.go +++ b/ctl/restore_test.go @@ -17,13 +17,13 @@ package ctl import ( "bufio" "bytes" + "context" "io" "io/ioutil" "testing" "github.com/pilosa/pilosa" "github.com/pilosa/pilosa/test" - "golang.org/x/net/context" ) func TestRestoreCommand_FileRequired(t *testing.T) {