From 3872dbea3e7a47f01ce1cde3c1ff207751a69ebd Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 7 Aug 2025 17:34:17 +0200 Subject: [PATCH] pkg/config: fix broken tests due indirect merge conflict Commit 57def960 added new test cases using the old function that were removed in 6c30f0c0. Because I didn't rebase my PR after the first commit was merged we introduced this conflict accidentally. Signed-off-by: Paul Holzinger --- pkg/config/config_local_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/config/config_local_test.go b/pkg/config/config_local_test.go index 568f29a4a..b650a0118 100644 --- a/pkg/config/config_local_test.go +++ b/pkg/config/config_local_test.go @@ -616,11 +616,11 @@ var _ = Describe("Config Local", func() { gomega.Expect(err.Error()).To(gomega.ContainSubstring("null bytes")) }) It("should parse log_path from config file", func() { - config, err := New(nil) + config, err := newLocked(&Options{}, &paths{}) gomega.Expect(err).ToNot(gomega.HaveOccurred()) gomega.Expect(config.Containers.LogPath).To(gomega.Equal("")) - config2, err := NewConfig("testdata/containers_default.conf") + config2, err := newLocked(&Options{}, &paths{etc: "testdata/containers_default.conf"}) gomega.Expect(err).ToNot(gomega.HaveOccurred()) gomega.Expect(config2.Containers.LogPath).To(gomega.Equal("/var/log/containers")) })