From acf4e9ce2bdf9dc2c4a0d0967e2e3408ffa66acb Mon Sep 17 00:00:00 2001 From: "Matt T. Proud" Date: Fri, 18 Jan 2013 16:29:47 +0100 Subject: [PATCH] Decouple from Bazaar. Having to use Bazaar to access gocheck is onerous. We have simply forked it at a revision until all tests can be replaced with table-driven ones. --- .travis.yml | 3 --- maths/helpers_for_testing.go | 2 +- maths/maths_test.go | 2 +- maths/statistics_test.go | 2 +- metrics/accumulating_bucket_test.go | 2 +- metrics/counter_test.go | 2 +- metrics/eviction_test.go | 2 +- metrics/gauge_test.go | 2 +- metrics/histogram_test.go | 2 +- metrics/metrics_test.go | 2 +- metrics/tallying_bucket_test.go | 2 +- metrics/timer_test.go | 2 +- utility/optional_test.go | 2 +- utility/priority_queue_test.go | 2 +- utility/test_helper.go | 2 +- utility/utility_test.go | 2 +- 16 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 161bef2..16d1c5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,5 @@ language: go -before_install: - - sudo apt-get install bzr >/dev/null 2>&1 - before_script: - go get -v github.com/matttproud/golang_instrumentation diff --git a/maths/helpers_for_testing.go b/maths/helpers_for_testing.go index 0fb1e98..57b8a38 100644 --- a/maths/helpers_for_testing.go +++ b/maths/helpers_for_testing.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package maths import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" "math" "reflect" ) diff --git a/maths/maths_test.go b/maths/maths_test.go index b5d21ae..6bee219 100644 --- a/maths/maths_test.go +++ b/maths/maths_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package maths import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" "testing" ) diff --git a/maths/statistics_test.go b/maths/statistics_test.go index 2c28a79..061c0b2 100644 --- a/maths/statistics_test.go +++ b/maths/statistics_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package maths import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" ) func (s *S) TestAverageOnEmpty(c *C) { diff --git a/metrics/accumulating_bucket_test.go b/metrics/accumulating_bucket_test.go index 765446e..0906798 100644 --- a/metrics/accumulating_bucket_test.go +++ b/metrics/accumulating_bucket_test.go @@ -9,9 +9,9 @@ license that can be found in the LICENSE file. package metrics import ( + . "github.com/matttproud/gocheck" "github.com/matttproud/golang_instrumentation/maths" "github.com/matttproud/golang_instrumentation/utility" - . "launchpad.net/gocheck" "time" ) diff --git a/metrics/counter_test.go b/metrics/counter_test.go index 94bde05..f47a916 100644 --- a/metrics/counter_test.go +++ b/metrics/counter_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package metrics import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" ) func (s *S) TestCounterCreate(c *C) { diff --git a/metrics/eviction_test.go b/metrics/eviction_test.go index b4d36d9..0c65244 100644 --- a/metrics/eviction_test.go +++ b/metrics/eviction_test.go @@ -10,9 +10,9 @@ package metrics import ( "container/heap" + . "github.com/matttproud/gocheck" "github.com/matttproud/golang_instrumentation/maths" "github.com/matttproud/golang_instrumentation/utility" - . "launchpad.net/gocheck" ) func (s *S) TestEvictOldest(c *C) { diff --git a/metrics/gauge_test.go b/metrics/gauge_test.go index 6930c40..6e9c011 100644 --- a/metrics/gauge_test.go +++ b/metrics/gauge_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package metrics import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" ) func (s *S) TestGaugeCreate(c *C) { diff --git a/metrics/histogram_test.go b/metrics/histogram_test.go index 212dc54..7831e0b 100644 --- a/metrics/histogram_test.go +++ b/metrics/histogram_test.go @@ -9,8 +9,8 @@ license that can be found in the LICENSE file. package metrics import ( + . "github.com/matttproud/gocheck" "github.com/matttproud/golang_instrumentation/maths" - . "launchpad.net/gocheck" ) func (s *S) TestEquallySizedBucketsFor(c *C) { diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go index 03c3888..beb1e59 100644 --- a/metrics/metrics_test.go +++ b/metrics/metrics_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package metrics import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" "testing" ) diff --git a/metrics/tallying_bucket_test.go b/metrics/tallying_bucket_test.go index dfa5394..8db3caa 100644 --- a/metrics/tallying_bucket_test.go +++ b/metrics/tallying_bucket_test.go @@ -9,8 +9,8 @@ license that can be found in the LICENSE file. package metrics import ( + . "github.com/matttproud/gocheck" "github.com/matttproud/golang_instrumentation/maths" - . "launchpad.net/gocheck" ) func (s *S) TestTallyingPercentileEstimatorMinimum(c *C) { diff --git a/metrics/timer_test.go b/metrics/timer_test.go index 294962e..e78c626 100644 --- a/metrics/timer_test.go +++ b/metrics/timer_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package metrics import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" "time" ) diff --git a/utility/optional_test.go b/utility/optional_test.go index 00f0f15..ef3772e 100644 --- a/utility/optional_test.go +++ b/utility/optional_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package utility import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" ) func (s *S) TestEmptyOptional(c *C) { diff --git a/utility/priority_queue_test.go b/utility/priority_queue_test.go index 0d1e51c..3922622 100644 --- a/utility/priority_queue_test.go +++ b/utility/priority_queue_test.go @@ -10,7 +10,7 @@ package utility import ( "container/heap" - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" ) func (s *S) TestPriorityQueueSort(c *C) { diff --git a/utility/test_helper.go b/utility/test_helper.go index b41169b..b57c4d2 100644 --- a/utility/test_helper.go +++ b/utility/test_helper.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package utility import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" ) type valueEqualsChecker struct { diff --git a/utility/utility_test.go b/utility/utility_test.go index 0962788..5647f1b 100644 --- a/utility/utility_test.go +++ b/utility/utility_test.go @@ -9,7 +9,7 @@ license that can be found in the LICENSE file. package utility import ( - . "launchpad.net/gocheck" + . "github.com/matttproud/gocheck" "testing" )