From 597cb29036958d02f235e81ef46a5430e41d92cd Mon Sep 17 00:00:00 2001 From: Ben Hood <0x6e6562@gmail.com> Date: Fri, 18 Sep 2015 16:40:04 +0100 Subject: [PATCH 1/3] Migrate dec/inf to gopkg.in/inf.v0 --- cqlr_test.go | 2 +- test/tmpl/kitchen_sink_data.go.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cqlr_test.go b/cqlr_test.go index 661ba2f..b0f365b 100644 --- a/cqlr_test.go +++ b/cqlr_test.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gocql/gocql" "github.com/stretchr/testify/assert" + "gopkg.in/inf.v0" "reflect" - "speter.net/go/exp/math/dec/inf" "testing" "time" ) diff --git a/test/tmpl/kitchen_sink_data.go.tmpl b/test/tmpl/kitchen_sink_data.go.tmpl index ecc7e1c..e84daba 100644 --- a/test/tmpl/kitchen_sink_data.go.tmpl +++ b/test/tmpl/kitchen_sink_data.go.tmpl @@ -5,7 +5,7 @@ package test import ( "time" "github.com/gocql/gocql" - "speter.net/go/exp/math/dec/inf" + "gopkg.in/inf.v0" ) {{ $inner := .types }} From 0558f2200469b5915ca0089a4c6e5b4d11712691 Mon Sep 17 00:00:00 2001 From: Ben Hood <0x6e6562@gmail.com> Date: Fri, 18 Sep 2015 16:52:12 +0100 Subject: [PATCH 2/3] Check the comparison issue on Go 1.5 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index db91140..6efc1fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: go go: - - 1.3 + - 1.5 before_install: - go get github.com/stretchr/testify/assert - go get github.com/cihub/seelog - export PATH=$PATH:/home/travis/gopath/bin:/usr/local/cassandra/bin -install: +install: - go get -v . script: From 8393e1bd3f73bf2d82e24be4a01626129bffdded Mon Sep 17 00:00:00 2001 From: Ben Hood <0x6e6562@gmail.com> Date: Fri, 18 Sep 2015 17:02:21 +0100 Subject: [PATCH 3/3] What does deep equal say --- test/kitchen_sink_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/kitchen_sink_test.go b/test/kitchen_sink_test.go index 1480306..110711c 100644 --- a/test/kitchen_sink_test.go +++ b/test/kitchen_sink_test.go @@ -6,6 +6,7 @@ import ( "github.com/gocql/gocql" "github.com/relops/cqlr" "github.com/stretchr/testify/assert" + "reflect" "strings" "testing" ) @@ -51,7 +52,7 @@ func TestKitchenSink(t *testing.T) { } assert.Equal(t, 1, count) - assert.Equal(t, k, nk) + assert.True(t, reflect.DeepEqual(k, nk)) } func setup(t *testing.T, table string) *gocql.Session {