Merge pull request #494 from Zariel/fix-test-create-table

Fix test create table

cass1batch_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestProto1BatchInsert(t *testing.T) {
 	session := createSession(t)
-	if err := session.Query("CREATE TABLE large (id int primary key)").Exec(); err != nil {
+	if err := createTable(session, "CREATE TABLE large (id int primary key)"); err != nil {
 		t.Fatal("create table:", err)
 	}
 	defer session.Close()

cassandra_test.go

@@ -89,6 +89,7 @@ func createCluster() *ClusterConfig {
 func createKeyspace(tb testing.TB, cluster *ClusterConfig, keyspace string) {
 	c := *cluster
 	c.Keyspace = "system"
+	c.Timeout = 20 * time.Second
 	session, err := c.CreateSession()
 	if err != nil {
 		tb.Fatal("createSession:", err)
@@ -115,6 +116,12 @@ func createKeyspace(tb testing.TB, cluster *ClusterConfig, keyspace string) {
 		tb.Fatal(err)
 	}
 
+	// the schema version might be out of data between 2 nodes, so wait for the
+	// cluster to settle.
+	// TODO(zariel): use events here to know when the cluster has resolved to the
+	// new schema version
+	time.Sleep(5 * time.Millisecond)
+
 	tb.Logf("Created keyspace %s", keyspace)
 }