Merge pull request #9 from deepaksinghvi/upgrade_go_version

Fixed test failures

Author: deepaksinghvi

pkg/model/read_config.go

@@ -8,17 +8,18 @@ import (
 )
 
 func readConfig(param []string) (*pkg.CduleConfig, error) {
-	viper.AddConfigPath(param[0]) //"./resources"
-	viper.SetConfigName(param[1]) // "config"
-	viper.AutomaticEnv()
-	viper.SetConfigType("yml")
+	v := viper.New()
+	v.AddConfigPath(param[0]) //"./resources"
+	v.SetConfigName(param[1]) // "config"
+	v.AutomaticEnv()
+	v.SetConfigType("yml")
 
 	var cduleConfig pkg.CduleConfig
-	if err := viper.ReadInConfig(); err != nil {
+	if err := v.ReadInConfig(); err != nil {
 		log.Error("Error reading config file ", err)
 		return nil, err
 	}
-	err := viper.Unmarshal(&cduleConfig)
+	err := v.Unmarshal(&cduleConfig)
 	if err != nil {
 		log.Error("Unable to read into CduleConfig ", err)
 		return nil, err

pkg/model/read_config_test.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"os"
 	"testing"
 
 	"github.com/deepaksinghvi/cdule/pkg"
@@ -12,7 +13,8 @@ func Test_ReadConfigInMemory(t *testing.T) {
 	cduleConfig, err := readConfig(param)
 	require.NoError(t, err)
 	require.Equal(t, string(pkg.MEMORY), cduleConfig.Cduletype)
-	require.Equal(t, "/Users/dsinghvi/sqlite.db", cduleConfig.Dburl)
+	require.Equal(t, "./sqlite.db", cduleConfig.Dburl)
+	_ = os.Remove("./sqlite.db")
 }
 
 func Test_ReadConfigInDB(t *testing.T) {

pkg/model/setup.go

@@ -122,7 +122,7 @@ func Migrate(db *gorm.DB) {
 func printConfig(config *pkg.CduleConfig) {
 	configJSON, err := json.MarshalIndent(config, "", "  ")
 	if err != nil {
-		log.Fatalf(err.Error())
+		log.Fatal(err)
 	}
 	fmt.Printf("Configuration %s\n", string(configJSON))
 }

pkg/model/setup_test.go

@@ -1,18 +1,21 @@
 package model
 
 import (
+	"os"
+	"path/filepath"
+	"testing"
+
 	"github.com/deepaksinghvi/cdule/pkg"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
-	"os"
-	"testing"
 )
 
 func Test_ConnectDatabase(t *testing.T) {
 	param := []string{"../../resources", "config_in_memory", "Info"} // default path for resource
 	cduleConfig, err := ConnectDataBase(param)
 	require.NoError(t, err)
 	require.NotEqual(t, pkg.EMPTYSTRING, cduleConfig.Dburl)
+	_ = os.Remove("./sqlite.db")
 }
 
 func Test_ConnectDatabaseFailedToReadConfig(t *testing.T) {
@@ -24,11 +27,15 @@ func Test_ConnectDatabaseFailedToReadConfig(t *testing.T) {
 		}
 	}()
 	param := []string{"./resources", "config_in_memory", "Info"} // default path for resource
-	_, _ = ConnectDataBase(param)
+	_, err := ConnectDataBase(param)
+	require.Error(t, err)
 	require.EqualValues(t, true, recovered)
 }
 
 func Test_ConnectPostgresDB(t *testing.T) {
+	if !testing.Short() {
+		t.Skip("skipping PostgreSQL test in -short mode")
+	}
 	db := postgresConn("postgres://cduleuser:cdulepassword@localhost:5432/cdule?sslmode=disable")
 	require.NotNil(t, db)
 }
@@ -57,6 +64,7 @@ func Test_ConnectSqlite(t *testing.T) {
 	require.NotNil(t, db)
 }
 
+// Test_ConnectSqliteDBPanic tests the panic when the database file is not found
 func Test_ConnectSqliteDBPanic(t *testing.T) {
 	recovered := false
 	defer func() {
@@ -65,13 +73,9 @@ func Test_ConnectSqliteDBPanic(t *testing.T) {
 			recovered = true
 		}
 	}()
-	dirname, err := os.UserHomeDir()
-	if err != nil {
-		log.Fatal(err)
-	}
-	_ = os.Remove(dirname + "/sqlite.db")
-
-	db := sqliteConn("///")
+	// Use a guaranteed invalid path (non-existent nested directory)
+	invalidPath := filepath.Join(os.TempDir(), "cdule-test-nonexistent", "nested", "db.sqlite")
+	db := sqliteConn(invalidPath)
 	require.Nil(t, db)
 	require.EqualValues(t, true, recovered)
 }

resources/config_in_memory.yml

@@ -1,3 +1,3 @@
 cduletype: MEMORY
-dburl: /Users/dsinghvi/sqlite.db
+dburl: ./sqlite.db
 cduleconsistency: AT_MOST_ONCE