Fix SchemaDir for internal server integration test (cadence-workflow#…

…1148)
marcusbooyah · Sep 28, 2018 · 6b5af52 · 6b5af52
1 parent b91d4c0
commit 6b5af52
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/common/persistence/cassandra/cassandraPersistenceTest.go b/common/persistence/cassandra/cassandraPersistenceTest.go
@@ -184,11 +184,16 @@ func (s *TestCluster) SetupTestDatabase(options *persistencetests.TestBaseOption
 
 	s.CreateSession(options)
 	s.CreateDatabase(1, options.DropDatabase)
-	cadencePackageDir, err := getCadencePackageDir()
-	if err != nil {
-		log.Fatal(err)
+	schemaDir := options.SchemaDir + "/"
+
+	if !strings.HasPrefix(schemaDir, "/") && !strings.HasPrefix(schemaDir, "../") {
+		cadencePackageDir, err := getCadencePackageDir()
+		if err != nil {
+			log.Fatal(err)
+		}
+		schemaDir = cadencePackageDir + schemaDir
 	}
-	schemaDir := cadencePackageDir + options.SchemaDir + "/"
+
 	s.LoadSchema([]string{"schema.cql"}, schemaDir)
 	s.LoadVisibilitySchema([]string{"schema.cql"}, schemaDir)
 }