Merge branch 'main' into copilot/fix-3611

Author: sixcolors

addon/retry/config.go

@@ -61,8 +61,8 @@ func configDefault(config ...Config) Config {
 	if cfg.MaxRetryCount <= 0 {
 		cfg.MaxRetryCount = DefaultConfig.MaxRetryCount
 	}
-	if cfg.currentInterval != cfg.InitialInterval {
-		cfg.currentInterval = DefaultConfig.currentInterval
+	if cfg.currentInterval == 0 {
+		cfg.currentInterval = cfg.InitialInterval
 	}
 	return cfg
 }

addon/retry/config_test.go

@@ -31,3 +31,39 @@ func TestConfigDefault_PartialAndNegative(t *testing.T) {
 	cfg := configDefault(Config{Multiplier: -1, MaxRetryCount: 0})
 	require.Equal(t, DefaultConfig, cfg)
 }
+
+func TestConfigDefault_CustomInitialInterval(t *testing.T) {
+	t.Parallel()
+
+	cfg := configDefault(Config{InitialInterval: 5 * time.Second})
+
+	require.Equal(t, 5*time.Second, cfg.currentInterval)
+	require.Equal(t, 5*time.Second, cfg.InitialInterval)
+}
+
+func TestConfigDefault_CustomCurrentInterval(t *testing.T) {
+	t.Parallel()
+
+	cfg := configDefault(Config{currentInterval: 3 * time.Second})
+
+	require.Equal(t, 3*time.Second, cfg.currentInterval)
+	require.Equal(t, DefaultConfig.InitialInterval, cfg.InitialInterval)
+}
+
+func TestConfigDefault_CurrentIntervalAndInitialDiffer(t *testing.T) {
+	t.Parallel()
+
+	cfg := configDefault(Config{InitialInterval: 5 * time.Second, currentInterval: 3 * time.Second})
+
+	require.Equal(t, 5*time.Second, cfg.InitialInterval)
+	require.Equal(t, 3*time.Second, cfg.currentInterval)
+}
+
+func TestNewExponentialBackoff_Config(t *testing.T) {
+	t.Parallel()
+
+	backoff := NewExponentialBackoff(Config{InitialInterval: 4 * time.Second})
+
+	require.Equal(t, 4*time.Second, backoff.InitialInterval)
+	require.Equal(t, 4*time.Second, backoff.currentInterval)
+}

helpers_test.go

@@ -1181,6 +1181,7 @@ func Benchmark_GenericParseTypeFloats(b *testing.B) {
 
 // go test -v -run=^$ -bench=Benchmark_GenericParseTypeBytes -benchmem -count=4
 func Benchmark_GenericParseTypeBytes(b *testing.B) {
+	b.Skip("Skipped: too fast to compare reliably (results in sub-ns range are unstable)")
 	cases := []struct {
 		str   string
 		err   error
@@ -1228,6 +1229,7 @@ func Benchmark_GenericParseTypeBytes(b *testing.B) {
 
 // go test -v -run=^$ -bench=Benchmark_GenericParseTypeString -benchmem -count=4
 func Benchmark_GenericParseTypeString(b *testing.B) {
+	b.Skip("Skipped: too fast to compare reliably (results in sub-ns range are unstable)")
 	tests := []string{"john", "doe", "hello", "fiber"}
 
 	for _, test := range tests {
@@ -1249,6 +1251,7 @@ func Benchmark_GenericParseTypeString(b *testing.B) {
 
 // go test -v -run=^$ -bench=Benchmark_GenericParseTypeBoolean -benchmem -count=4
 func Benchmark_GenericParseTypeBoolean(b *testing.B) {
+	b.Skip("Skipped: too fast to compare reliably (results in sub-ns range are unstable)")
 	bools := []struct {
 		str   string
 		value bool
@@ -1385,3 +1388,30 @@ func Test_IsEtagStale(t *testing.T) {
 	// Weak vs. weak
 	require.False(t, app.isEtagStale(`W/"a"`, []byte(`W/"a"`)))
 }
+
+func Test_App_quoteRawString(t *testing.T) {
+	t.Parallel()
+
+	cases := []struct {
+		name string
+		in   string
+		out  string
+	}{
+		{"empty", "", ""},
+		{"simple", "simple", "simple"},
+		{"backslash", "A\\B", "A\\\\B"},
+		{"quote", `He said "Yo"`, `He said \"Yo\"`},
+		{"newline", "Hello\n", "Hello\\n"},
+		{"carriage", "Hello\r", "Hello\\r"},
+		{"controls", string([]byte{0, 31, 127}), "%00%1F%7F"},
+		{"mixed", "test \"A\n\r" + string([]byte{1}) + "\\", `test \"A\n\r%01\\`},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			app := New()
+			require.Equal(t, tc.out, app.quoteRawString(tc.in))
+		})
+	}
+}