Adjusted unit-tests

arduino · cmaglie · Dec 18, 2024 · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024
commit ff3735f7f561abb58f4c8ec18eb418af2aeae7e9
diff --git a/commands/service_settings_test.go b/commands/service_settings_test.go
@@ -224,12 +224,73 @@ func TestDelete(t *testing.T) {
 	srv := NewArduinoCoreServer()
 	loadConfig(t, srv, paths.New("testdata", "arduino-cli.yml"))

-	_, err := srv.SettingsGetValue(context.Background(), &rpc.SettingsGetValueRequest{Key: "network"})
+	// Check loaded config
+	resp, err := srv.ConfigurationSave(context.Background(), &rpc.ConfigurationSaveRequest{
+		SettingsFormat: "yaml",
+	})
+	require.NoError(t, err)
+	require.YAMLEq(t, `
+board_manager:
+  additional_urls:
+    - http://foobar.com
+    - http://example.com
+
+daemon:
+  port: "50051"
+
+directories:
+  data: /home/massi/.arduino15
+  downloads: /home/massi/.arduino15/staging
+
+logging:
+  file: ""
+  format: text
+  level: info
+
+network:
+  proxy: "123"
+`, resp.GetEncodedSettings())
+
+	// Check default and setted values
+	res, err := srv.SettingsGetValue(context.Background(), &rpc.SettingsGetValueRequest{Key: "network"})
+	require.NoError(t, err)
+	require.Equal(t, `{"proxy":"123"}`, res.GetEncodedValue())
+	// Maybe should be like this?
+	// require.Equal(t, `{"proxy":"123","connection_timeout":"1m0s"}`, res.GetEncodedValue())
+	res, err = srv.SettingsGetValue(context.Background(), &rpc.SettingsGetValueRequest{Key: "network.connection_timeout"})
+	require.Equal(t, `"1m0s"`, res.GetEncodedValue()) // default value
 	require.NoError(t, err)

+	// Run deletion
 	_, err = srv.SettingsSetValue(context.Background(), &rpc.SettingsSetValueRequest{Key: "network", EncodedValue: ""})
 	require.NoError(t, err)
+	resp, err = srv.ConfigurationSave(context.Background(), &rpc.ConfigurationSaveRequest{
+		SettingsFormat: "yaml",
+	})
+	require.NoError(t, err)
+	require.YAMLEq(t, `
+board_manager:
+  additional_urls:
+    - http://foobar.com
+    - http://example.com

-	_, err = srv.SettingsGetValue(context.Background(), &rpc.SettingsGetValueRequest{Key: "network"})
-	require.Error(t, err)
+daemon:
+  port: "50051"
+
+directories:
+  data: /home/massi/.arduino15
+  downloads: /home/massi/.arduino15/staging
+
+logging:
+  file: ""
+  format: text
+  level: info
+`, resp.GetEncodedSettings())
+	// Check default and setted values
+	res, err = srv.SettingsGetValue(context.Background(), &rpc.SettingsGetValueRequest{Key: "network"})
+	require.NoError(t, err)
+	require.Equal(t, `{"connection_timeout":"1m0s"}`, res.GetEncodedValue())
+	res, err = srv.SettingsGetValue(context.Background(), &rpc.SettingsGetValueRequest{Key: "network.connection_timeout"})
+	require.Equal(t, `"1m0s"`, res.GetEncodedValue()) // default value
+	require.NoError(t, err)
 }
diff --git a/internal/cli/configuration/network_test.go b/internal/cli/configuration/network_test.go
@@ -79,9 +79,9 @@ func TestConnectionTimeout(t *testing.T) {

 	doRequest := func(timeout int) (*http.Response, time.Duration, error) {
 		settings := configuration.NewSettings()
-		settings.Set("network.proxy", ts.URL)
+		require.NoError(t, settings.Set("network.proxy", ts.URL))
 		if timeout != 0 {
-			settings.Set("network.connection_timeout", 2)
+			require.NoError(t, settings.Set("network.connection_timeout", "2s"))
 		}
 		client, err := settings.NewHttpClient()
 		require.NoError(t, err)