oops

Signed-off-by: Micah Chambers <[email protected]>
containers · Mar 2, 2024 · 0df576e · 0df576e
1 parent 17b7969
commit 0df576e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/pkg/config/config_local_test.go b/pkg/config/config_local_test.go
@@ -368,7 +368,13 @@ var _ = Describe("Config Local", func() {
  config3, err := NewConfig("testdata/containers_override.conf")
  // Then
  gomega.Expect(err).To(gomega.BeNil())
- gomega.Expect(config3.Engine.CdiSpecDirs.Get()).To(gomega.Equal([]string{"/somepath", "/some_other_path"}))
+ gomega.Expect(config3.Engine.CdiSpecDirs.Get()).To(gomega.Equal([]string{"/somepath"}))
+
+ // Given override just get override
+ config4, err := NewConfig("testdata/containers_override2.conf")
+ // Then
+ gomega.Expect(err).To(gomega.BeNil())
+ gomega.Expect(config4.Engine.CdiSpecDirs.Get()).To(gomega.Equal([]string{"/somepath", "/some_other_path"}))
  })
 
  It("Expect Remote to be False", func() {

diff --git a/pkg/config/testdata/containers_default.conf b/pkg/config/testdata/containers_default.conf
@@ -226,7 +226,7 @@ hooks_dir = [
 ]
 
 # Directories to scan for CDI Spec files.
-cdi_spec_dirs = [ "/etc/cdi" ]
+# cdi_spec_dirs = [ "/etc/cdi" ]
 
 # Default infra (pause) image name for pod infra containers
 infra_image = "k8s.gcr.io/pause:3.4.1"

diff --git a/pkg/config/testdata/containers_override.conf b/pkg/config/testdata/containers_override.conf
@@ -17,7 +17,7 @@ events_logfile_max_size="500"
 events_container_create_inspect_data = true
 pod_exit_policy="stop"
 compression_format="zstd:chunked"
-cdi_spec_dirs = [ "/somepath", "/some_other_path" ]
+cdi_spec_dirs = [ "/somepath" ]
 
 [engine.platform_to_oci_runtime]
 hello = "world"

diff --git a/pkg/config/testdata/containers_override2.conf b/pkg/config/testdata/containers_override2.conf
@@ -0,0 +1,5 @@
+[containers]
+
+[engine]
+cdi_spec_dirs = [ "/somepath", "/some_other_path" ]
+