Adjust Go tests to account for FillDefaults

posit-dev · Oct 7, 2024 · 1111fd7 · 1111fd7
1 parent 1161173
commit 1111fd7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/internal/initialize/initialize_test.go b/internal/initialize/initialize_test.go
@@ -145,6 +145,7 @@ func (s *InitializeSuite) TestInitIfNeededWhenNotNeeded() {
 		PackageManager: "pip",
 	}
 	cfg.WriteFile(configPath)
+	cfg.FillDefaults()
 
 	PythonInspectorFactory = func(util.AbsolutePath, util.Path, logging.Logger) inspect.PythonInspector {
 		return &inspect.MockPythonInspector{}

diff --git a/internal/services/api/get_configuration_test.go b/internal/services/api/get_configuration_test.go
@@ -52,7 +52,9 @@ func (s *GetConfigurationuite) makeConfiguration(name string) *config.Config {
 	}
 	err := cfg.WriteFile(path)
 	s.NoError(err)
-	return cfg
+	r, err := config.FromFile(path)
+	s.NoError(err)
+	return r
 }
 
 func (s *GetConfigurationuite) TestGetConfiguration() {

diff --git a/internal/services/api/get_configurations_test.go b/internal/services/api/get_configurations_test.go
@@ -51,7 +51,9 @@ func (s *GetConfigurationsSuite) makeConfiguration(name string) *config.Config {
 	}
 	err := cfg.WriteFile(path)
 	s.NoError(err)
-	return cfg
+	r, err := config.FromFile(path)
+	s.NoError(err)
+	return r
 }
 
 func (s *GetConfigurationsSuite) TestGetConfigurations() {
@@ -214,7 +216,9 @@ func (s *GetConfigurationsSuite) makeSubdirConfiguration(name string, subdir str
 	}
 	err = cfg.WriteFile(path)
 	s.NoError(err)
-	return cfg
+	r, err := config.FromFile(path)
+	s.NoError(err)
+	return r
 }
 
 func (s *GetConfigurationsSuite) TestGetConfigurationsRecursive() {

diff --git a/internal/state/state_test.go b/internal/state/state_test.go
@@ -277,7 +277,9 @@ func (s *StateSuite) makeConfiguration(name string) *config.Config {
 	}
 	err := cfg.WriteFile(path)
 	s.NoError(err)
-	return cfg
+	r, err := config.FromFile(path)
+	s.NoError(err)
+	return r
 }
 
 func (s *StateSuite) makeConfigurationWithSecrets(name string, secrets []string) *config.Config {
@@ -424,6 +426,7 @@ func (s *StateSuite) TestNewWithTargetAndAccount() {
 	s.Equal("savedConfigName", state.ConfigName)
 	s.Equal("myTargetName", state.TargetName)
 	s.Equal(&acct2, state.Account)
+
 	s.Equal(cfg, state.Config)
 	s.Equal(d, state.Target)
 }