Merge branch 'main' into switch-resume

jotaen · Aug 17, 2024 · 4422bf9 · 4422bf9
2 parents 26d9bd4 + 1e41085
commit 4422bf9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/klog/app/config.go b/klog/app/config.go
@@ -2,6 +2,7 @@ package app
 
 import (
 	"errors"
+	"sort"
 	"strings"
 
 	"github.com/jotaen/genie"
@@ -349,6 +350,7 @@ var CONFIG_FILE_ENTRIES = []ConfigFileEntries[any]{
 						keys = append(keys, k)
 					}
 				}
+				sort.Strings(keys)
 				result = strings.Join(keys, ", ")
 			})
 			return result, c.NoWarnings.origin

diff --git a/klog/app/config_test.go b/klog/app/config_test.go
@@ -214,7 +214,7 @@ func TestNoWarningsParamFromConfigFile(t *testing.T) {
 			dc["MORE_THAN_24H"] = true
 			return dc
 		}()},
-		// Multiple values
+		// Multiple values (sorted alphabetically)
 		{`no_warnings = MORE_THAN_24H, OVERLAPPING_RANGES`, func() service.DisabledCheckers {
 			dc := service.NewDisabledCheckers()
 			dc["MORE_THAN_24H"] = true
@@ -266,7 +266,7 @@ default_rounding = 15m
 default_should_total = 8h!
 date_format = YYYY-MM-DD
 time_convention = 24h
-no_warnings = OVERLAPPING_RANGES, MORE_THAN_24H
+no_warnings = MORE_THAN_24H, OVERLAPPING_RANGES
 `} {
 		cfg, _ := NewConfig(
 			FromDeterminedValues{NumCpus: 1},