Merge pull request #428 from Zariel/remove-timouts

remove query level timeouts

conn.go

@@ -379,12 +379,7 @@ func (c *Conn) exec(req frameWriter, tracer Tracer) (frame, error) {
 		return nil, err
 	}
 
-	select {
-	case err = <-call.resp:
-	case <-time.After(c.timeout):
-		c.handleTimeout()
-		return nil, ErrTimeoutNoResponse
-	}
+	err = <-call.resp
 
 	if err != nil {
 		return nil, err

conn_test.go

@@ -472,6 +472,7 @@ func TestPolicyConnPoolSSL(t *testing.T) {
 }
 
 func TestQueryTimeout(t *testing.T) {
+	t.Skip("skipping until query timeouts are enabled")
 	srv := NewTestServer(t, protoVersion2)
 	defer srv.Stop()