fixes #418
when using device type `sat,auto`, scrutiny config parser will treat `type: 'sat,auto'` as a list, which will cause it to be treated like a raid disk. force single command execution using `type: ['sat,auto']`
This commit is contained in:
@@ -36,6 +36,25 @@ func TestConfiguration_GetScanOverrides_Simple(t *testing.T) {
|
|||||||
require.Equal(t, []models.ScanOverride{{Device: "/dev/sda", DeviceType: []string{"sat"}, Ignore: false}}, scanOverrides)
|
require.Equal(t, []models.ScanOverride{{Device: "/dev/sda", DeviceType: []string{"sat"}, Ignore: false}}, scanOverrides)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// fixes #418
|
||||||
|
func TestConfiguration_GetScanOverrides_DeviceTypeComma(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
//setup
|
||||||
|
testConfig, _ := config.Create()
|
||||||
|
|
||||||
|
//test
|
||||||
|
err := testConfig.ReadConfig(path.Join("testdata", "device_type_comma.yaml"))
|
||||||
|
require.NoError(t, err, "should correctly load simple device config")
|
||||||
|
scanOverrides := testConfig.GetDeviceOverrides()
|
||||||
|
|
||||||
|
//assert
|
||||||
|
require.Equal(t, []models.ScanOverride{
|
||||||
|
{Device: "/dev/sda", DeviceType: []string{"sat", "auto"}, Ignore: false},
|
||||||
|
{Device: "/dev/sdb", DeviceType: []string{"sat,auto"}, Ignore: false},
|
||||||
|
}, scanOverrides)
|
||||||
|
}
|
||||||
|
|
||||||
func TestConfiguration_GetScanOverrides_Ignore(t *testing.T) {
|
func TestConfiguration_GetScanOverrides_Ignore(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
version: 1
|
||||||
|
devices:
|
||||||
|
# the scrutiny config parser will detect `sat,auto` as two separate items in a list. If you want to use `-d sat,auto` you must
|
||||||
|
# set 'sat,auto' in a list (see eg. /dev/sbd)
|
||||||
|
- device: /dev/sda
|
||||||
|
type: 'sat,auto'
|
||||||
|
- device: /dev/sdb
|
||||||
|
type:
|
||||||
|
- sat,auto
|
||||||
@@ -31,6 +31,10 @@ devices:
|
|||||||
# - device: /dev/sda
|
# - device: /dev/sda
|
||||||
# type: 'sat'
|
# type: 'sat'
|
||||||
#
|
#
|
||||||
|
# # example for using `-d sat,auto`, notice the square brackets (workaround for #418)
|
||||||
|
# - device: /dev/sda
|
||||||
|
# type: ['sat,auto']
|
||||||
|
#
|
||||||
# # example to show how to ignore a specific disk/device.
|
# # example to show how to ignore a specific disk/device.
|
||||||
# - device: /dev/sda
|
# - device: /dev/sda
|
||||||
# ignore: true
|
# ignore: true
|
||||||
|
|||||||
Reference in New Issue
Block a user