fix cluster tests

Author: CMogilko

.travis.yml

@@ -20,8 +20,8 @@ before_script:
   - sudo apt-get update
   - sudo apt-get install rethinkdb
   - rethinkdb > /dev/null 2>&1 &
-  - rethinkdb --port-offset 1 --directory rethinkdb_data1 --join localhost:29015 > /dev/null 2>&1 &
-  - rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29015 > /dev/null 2>&1 &
-  - rethinkdb --port-offset 3 --directory rethinkdb_data3 --join localhost:29015 > /dev/null 2>&1 &
+  - rethinkdb --port-offset 1 --directory rethinkdb_data1                        > /dev/null 2>&1 &
+  - rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29016 > /dev/null 2>&1 &
+  - rethinkdb --port-offset 3 --directory rethinkdb_data3 --join localhost:29016 > /dev/null 2>&1 &
 
 script: go test -tags='cluster' -short -race -v ./...

internal/integration/tests/query_test.go

@@ -46,11 +46,12 @@ func (s *RethinkSuite) TestQueryExec(c *test.C) {
 }
 
 func (s *RethinkSuite) TestQueryRunWrite(c *test.C) {
+	r.DBDrop("test_runwrite").Exec(session)
 	err := r.DBCreate("test_runwrite").Exec(session)
 	c.Assert(err, test.IsNil)
 	err = r.DB("test_runwrite").TableCreate("test_runwrite").Exec(session)
 	c.Assert(err, test.IsNil)
-	err = r.DB("test_runwrite").TableCreate("test_runwrite").Wait().Exec(session)
+	err = r.DB("test_runwrite").Table("test_runwrite").Wait().Exec(session)
 	c.Assert(err, test.IsNil)
 
 	query := r.DB("test_runwrite").Table("test_runwrite").Insert([]interface{}{