diff options
author | Miloslav Trmač <mitr@redhat.com> | 2020-03-20 23:40:00 +0100 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2020-03-21 00:21:59 +0100 |
commit | e625b57d225cd5646d6b52a45119c240b94e0741 (patch) | |
tree | 5fdcb0cf5067d5c8f135206ba07217b470a0d0c8 | |
parent | 036531c0064df9b21414fbad4056d90edc54533b (diff) | |
download | podman-e625b57d225cd5646d6b52a45119c240b94e0741.tar.gz podman-e625b57d225cd5646d6b52a45119c240b94e0741.tar.bz2 podman-e625b57d225cd5646d6b52a45119c240b94e0741.zip |
Only run TestGetImageConfigStopSignal on Linux
... because the implementation requires Linux-only pkg/signal
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
-rw-r--r-- | pkg/util/utils_linux_test.go | 29 | ||||
-rw-r--r-- | pkg/util/utils_test.go | 19 |
2 files changed, 29 insertions, 19 deletions
diff --git a/pkg/util/utils_linux_test.go b/pkg/util/utils_linux_test.go new file mode 100644 index 000000000..38e6dbef9 --- /dev/null +++ b/pkg/util/utils_linux_test.go @@ -0,0 +1,29 @@ +package util + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestGetImageConfigStopSignal(t *testing.T) { + // Linux-only beause parsing signal names is not supported on non-Linux systems by + // pkg/signal. + stopSignalValidInt, err := GetImageConfig([]string{"STOPSIGNAL 9"}) + require.Nil(t, err) + assert.Equal(t, stopSignalValidInt.StopSignal, "9") + + stopSignalValidString, err := GetImageConfig([]string{"STOPSIGNAL SIGKILL"}) + require.Nil(t, err) + assert.Equal(t, stopSignalValidString.StopSignal, "9") + + _, err = GetImageConfig([]string{"STOPSIGNAL 0"}) + assert.NotNil(t, err) + + _, err = GetImageConfig([]string{"STOPSIGNAL garbage"}) + assert.NotNil(t, err) + + _, err = GetImageConfig([]string{"STOPSIGNAL "}) + assert.NotNil(t, err) +} diff --git a/pkg/util/utils_test.go b/pkg/util/utils_test.go index f4b03599d..0995d1e20 100644 --- a/pkg/util/utils_test.go +++ b/pkg/util/utils_test.go @@ -219,25 +219,6 @@ func TestGetImageConfigLabel(t *testing.T) { assert.NotNil(t, err) } -func TestGetImageConfigStopSignal(t *testing.T) { - stopSignalValidInt, err := GetImageConfig([]string{"STOPSIGNAL 9"}) - require.Nil(t, err) - assert.Equal(t, stopSignalValidInt.StopSignal, "9") - - stopSignalValidString, err := GetImageConfig([]string{"STOPSIGNAL SIGKILL"}) - require.Nil(t, err) - assert.Equal(t, stopSignalValidString.StopSignal, "9") - - _, err = GetImageConfig([]string{"STOPSIGNAL 0"}) - assert.NotNil(t, err) - - _, err = GetImageConfig([]string{"STOPSIGNAL garbage"}) - assert.NotNil(t, err) - - _, err = GetImageConfig([]string{"STOPSIGNAL "}) - assert.NotNil(t, err) -} - func TestGetImageConfigOnBuild(t *testing.T) { onBuildOne, err := GetImageConfig([]string{"ONBUILD ADD /testdir1"}) require.Nil(t, err) |