From 06591d3ba3298c2c7860d55bceda12ff5e48078f Mon Sep 17 00:00:00 2001 From: Zhou Hao Date: Mon, 4 Jun 2018 09:20:00 +0800 Subject: [PATCH] travis: add go 1.10 Signed-off-by: Zhou Hao --- .travis.yml | 1 + Makefile | 2 +- api/socket/socket.go | 8 ++++---- .../config_updates_without_affect.go | 0 validation/{ => create}/create.go | 0 validation/{ => default}/default.go | 0 validation/{ => delete}/delete.go | 0 validation/{ => hooks}/hooks.go | 0 validation/{ => hooks_stdin}/hooks_stdin.go | 0 validation/{ => hostname}/hostname.go | 0 validation/{ => kill}/kill.go | 0 validation/{ => kill_no_effect}/kill_no_effect.go | 0 validation/{ => killsig}/killsig.go | 0 .../{ => linux_cgroups_blkio}/linux_cgroups_blkio.go | 0 validation/{ => linux_cgroups_cpus}/linux_cgroups_cpus.go | 0 .../{ => linux_cgroups_devices}/linux_cgroups_devices.go | 0 .../{ => linux_cgroups_hugetlb}/linux_cgroups_hugetlb.go | 0 .../{ => linux_cgroups_memory}/linux_cgroups_memory.go | 0 .../{ => linux_cgroups_network}/linux_cgroups_network.go | 0 validation/{ => linux_cgroups_pids}/linux_cgroups_pids.go | 0 .../linux_cgroups_relative_blkio.go | 0 .../linux_cgroups_relative_cpus.go | 0 .../linux_cgroups_relative_devices.go | 0 .../linux_cgroups_relative_hugetlb.go | 0 .../linux_cgroups_relative_memory.go | 0 .../linux_cgroups_relative_network.go | 0 .../linux_cgroups_relative_pids.go | 0 validation/{ => linux_devices}/linux_devices.go | 0 validation/{ => linux_masked_paths}/linux_masked_paths.go | 0 validation/{ => linux_ns_itype}/linux_ns_itype.go | 0 validation/{ => linux_ns_nopath}/linux_ns_nopath.go | 0 validation/{ => linux_ns_path}/linux_ns_path.go | 0 validation/{ => linux_ns_path_type}/linux_ns_path_type.go | 0 .../{ => linux_readonly_paths}/linux_readonly_paths.go | 0 .../linux_rootfs_propagation.go | 0 validation/{ => linux_seccomp}/linux_seccomp.go | 0 validation/{ => linux_sysctl}/linux_sysctl.go | 0 validation/{ => linux_uid_mappings}/linux_uid_mappings.go | 0 validation/{ => misc_props}/misc_props.go | 0 validation/{ => mounts}/mounts.go | 0 validation/{ => pidfile}/pidfile.go | 0 validation/{ => poststart}/poststart.go | 0 validation/{ => poststart_fail}/poststart_fail.go | 0 validation/{ => poststop}/poststop.go | 0 validation/{ => poststop_fail}/poststop_fail.go | 0 validation/{ => prestart}/prestart.go | 0 validation/{ => prestart_fail}/prestart_fail.go | 0 validation/{ => process}/process.go | 0 .../{ => process_capabilities}/process_capabilities.go | 0 .../process_capabilities_fail.go | 0 .../{ => process_oom_score_adj}/process_oom_score_adj.go | 0 validation/{ => process_rlimits}/process_rlimits.go | 0 .../{ => process_rlimits_fail}/process_rlimits_fail.go | 0 validation/{ => process_user}/process_user.go | 0 validation/{ => root_readonly_true}/root_readonly_true.go | 0 validation/{ => start}/start.go | 0 validation/{ => state}/state.go | 0 57 files changed, 6 insertions(+), 5 deletions(-) rename validation/{ => config_updates_without_affect}/config_updates_without_affect.go (100%) rename validation/{ => create}/create.go (100%) rename validation/{ => default}/default.go (100%) rename validation/{ => delete}/delete.go (100%) rename validation/{ => hooks}/hooks.go (100%) rename validation/{ => hooks_stdin}/hooks_stdin.go (100%) rename validation/{ => hostname}/hostname.go (100%) rename validation/{ => kill}/kill.go (100%) rename validation/{ => kill_no_effect}/kill_no_effect.go (100%) rename validation/{ => killsig}/killsig.go (100%) rename validation/{ => linux_cgroups_blkio}/linux_cgroups_blkio.go (100%) rename validation/{ => linux_cgroups_cpus}/linux_cgroups_cpus.go (100%) rename validation/{ => linux_cgroups_devices}/linux_cgroups_devices.go (100%) rename validation/{ => linux_cgroups_hugetlb}/linux_cgroups_hugetlb.go (100%) rename validation/{ => linux_cgroups_memory}/linux_cgroups_memory.go (100%) rename validation/{ => linux_cgroups_network}/linux_cgroups_network.go (100%) rename validation/{ => linux_cgroups_pids}/linux_cgroups_pids.go (100%) rename validation/{ => linux_cgroups_relative_blkio}/linux_cgroups_relative_blkio.go (100%) rename validation/{ => linux_cgroups_relative_cpus}/linux_cgroups_relative_cpus.go (100%) rename validation/{ => linux_cgroups_relative_devices}/linux_cgroups_relative_devices.go (100%) rename validation/{ => linux_cgroups_relative_hugetlb}/linux_cgroups_relative_hugetlb.go (100%) rename validation/{ => linux_cgroups_relative_memory}/linux_cgroups_relative_memory.go (100%) rename validation/{ => linux_cgroups_relative_network}/linux_cgroups_relative_network.go (100%) rename validation/{ => linux_cgroups_relative_pids}/linux_cgroups_relative_pids.go (100%) rename validation/{ => linux_devices}/linux_devices.go (100%) rename validation/{ => linux_masked_paths}/linux_masked_paths.go (100%) rename validation/{ => linux_ns_itype}/linux_ns_itype.go (100%) rename validation/{ => linux_ns_nopath}/linux_ns_nopath.go (100%) rename validation/{ => linux_ns_path}/linux_ns_path.go (100%) rename validation/{ => linux_ns_path_type}/linux_ns_path_type.go (100%) rename validation/{ => linux_readonly_paths}/linux_readonly_paths.go (100%) rename validation/{ => linux_rootfs_propagation}/linux_rootfs_propagation.go (100%) rename validation/{ => linux_seccomp}/linux_seccomp.go (100%) rename validation/{ => linux_sysctl}/linux_sysctl.go (100%) rename validation/{ => linux_uid_mappings}/linux_uid_mappings.go (100%) rename validation/{ => misc_props}/misc_props.go (100%) rename validation/{ => mounts}/mounts.go (100%) rename validation/{ => pidfile}/pidfile.go (100%) rename validation/{ => poststart}/poststart.go (100%) rename validation/{ => poststart_fail}/poststart_fail.go (100%) rename validation/{ => poststop}/poststop.go (100%) rename validation/{ => poststop_fail}/poststop_fail.go (100%) rename validation/{ => prestart}/prestart.go (100%) rename validation/{ => prestart_fail}/prestart_fail.go (100%) rename validation/{ => process}/process.go (100%) rename validation/{ => process_capabilities}/process_capabilities.go (100%) rename validation/{ => process_capabilities_fail}/process_capabilities_fail.go (100%) rename validation/{ => process_oom_score_adj}/process_oom_score_adj.go (100%) rename validation/{ => process_rlimits}/process_rlimits.go (100%) rename validation/{ => process_rlimits_fail}/process_rlimits_fail.go (100%) rename validation/{ => process_user}/process_user.go (100%) rename validation/{ => root_readonly_true}/root_readonly_true.go (100%) rename validation/{ => start}/start.go (100%) rename validation/{ => state}/state.go (100%) diff --git a/.travis.yml b/.travis.yml index f78c51410..b50973cb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ go: - 1.7.x - 1.8.x - 1.9.x + - 1.10.x sudo: false diff --git a/Makefile b/Makefile index 4cd61063a..93aae1f85 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ BUILDTAGS= RUNTIME ?= runc COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true) VERSION := ${shell cat ./VERSION} -VALIDATION_TESTS ?= $(patsubst %.go,%.t,$(wildcard validation/*.go)) +VALIDATION_TESTS ?= $(patsubst %.go,%.t,$(shell find ./validation/ -name *.go | grep -v util)) all: tool runtimetest validation-executables diff --git a/api/socket/socket.go b/api/socket/socket.go index 7bb23dc94..fc3a6af3f 100644 --- a/api/socket/socket.go +++ b/api/socket/socket.go @@ -1,14 +1,14 @@ package socket -// Message is the normal data for messages passed on the console socket. -type Message struct { +// Common is the normal data for messages passed on the console socket. +type Common struct { // Type of message being passed Type string `json:"type"` } // TerminalRequest is the normal data for messages passing a pseudoterminal master. type TerminalRequest struct { - Message + Common // Container ID for the container whose pseudoterminal master is being set. Container string `json:"container"` @@ -16,7 +16,7 @@ type TerminalRequest struct { // Response is the normal data for response messages. type Response struct { - Message + Common // Message is a phrase describing the response. Message string `json:"message,omitempty"` diff --git a/validation/config_updates_without_affect.go b/validation/config_updates_without_affect/config_updates_without_affect.go similarity index 100% rename from validation/config_updates_without_affect.go rename to validation/config_updates_without_affect/config_updates_without_affect.go diff --git a/validation/create.go b/validation/create/create.go similarity index 100% rename from validation/create.go rename to validation/create/create.go diff --git a/validation/default.go b/validation/default/default.go similarity index 100% rename from validation/default.go rename to validation/default/default.go diff --git a/validation/delete.go b/validation/delete/delete.go similarity index 100% rename from validation/delete.go rename to validation/delete/delete.go diff --git a/validation/hooks.go b/validation/hooks/hooks.go similarity index 100% rename from validation/hooks.go rename to validation/hooks/hooks.go diff --git a/validation/hooks_stdin.go b/validation/hooks_stdin/hooks_stdin.go similarity index 100% rename from validation/hooks_stdin.go rename to validation/hooks_stdin/hooks_stdin.go diff --git a/validation/hostname.go b/validation/hostname/hostname.go similarity index 100% rename from validation/hostname.go rename to validation/hostname/hostname.go diff --git a/validation/kill.go b/validation/kill/kill.go similarity index 100% rename from validation/kill.go rename to validation/kill/kill.go diff --git a/validation/kill_no_effect.go b/validation/kill_no_effect/kill_no_effect.go similarity index 100% rename from validation/kill_no_effect.go rename to validation/kill_no_effect/kill_no_effect.go diff --git a/validation/killsig.go b/validation/killsig/killsig.go similarity index 100% rename from validation/killsig.go rename to validation/killsig/killsig.go diff --git a/validation/linux_cgroups_blkio.go b/validation/linux_cgroups_blkio/linux_cgroups_blkio.go similarity index 100% rename from validation/linux_cgroups_blkio.go rename to validation/linux_cgroups_blkio/linux_cgroups_blkio.go diff --git a/validation/linux_cgroups_cpus.go b/validation/linux_cgroups_cpus/linux_cgroups_cpus.go similarity index 100% rename from validation/linux_cgroups_cpus.go rename to validation/linux_cgroups_cpus/linux_cgroups_cpus.go diff --git a/validation/linux_cgroups_devices.go b/validation/linux_cgroups_devices/linux_cgroups_devices.go similarity index 100% rename from validation/linux_cgroups_devices.go rename to validation/linux_cgroups_devices/linux_cgroups_devices.go diff --git a/validation/linux_cgroups_hugetlb.go b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go similarity index 100% rename from validation/linux_cgroups_hugetlb.go rename to validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go diff --git a/validation/linux_cgroups_memory.go b/validation/linux_cgroups_memory/linux_cgroups_memory.go similarity index 100% rename from validation/linux_cgroups_memory.go rename to validation/linux_cgroups_memory/linux_cgroups_memory.go diff --git a/validation/linux_cgroups_network.go b/validation/linux_cgroups_network/linux_cgroups_network.go similarity index 100% rename from validation/linux_cgroups_network.go rename to validation/linux_cgroups_network/linux_cgroups_network.go diff --git a/validation/linux_cgroups_pids.go b/validation/linux_cgroups_pids/linux_cgroups_pids.go similarity index 100% rename from validation/linux_cgroups_pids.go rename to validation/linux_cgroups_pids/linux_cgroups_pids.go diff --git a/validation/linux_cgroups_relative_blkio.go b/validation/linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.go similarity index 100% rename from validation/linux_cgroups_relative_blkio.go rename to validation/linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.go diff --git a/validation/linux_cgroups_relative_cpus.go b/validation/linux_cgroups_relative_cpus/linux_cgroups_relative_cpus.go similarity index 100% rename from validation/linux_cgroups_relative_cpus.go rename to validation/linux_cgroups_relative_cpus/linux_cgroups_relative_cpus.go diff --git a/validation/linux_cgroups_relative_devices.go b/validation/linux_cgroups_relative_devices/linux_cgroups_relative_devices.go similarity index 100% rename from validation/linux_cgroups_relative_devices.go rename to validation/linux_cgroups_relative_devices/linux_cgroups_relative_devices.go diff --git a/validation/linux_cgroups_relative_hugetlb.go b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go similarity index 100% rename from validation/linux_cgroups_relative_hugetlb.go rename to validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go diff --git a/validation/linux_cgroups_relative_memory.go b/validation/linux_cgroups_relative_memory/linux_cgroups_relative_memory.go similarity index 100% rename from validation/linux_cgroups_relative_memory.go rename to validation/linux_cgroups_relative_memory/linux_cgroups_relative_memory.go diff --git a/validation/linux_cgroups_relative_network.go b/validation/linux_cgroups_relative_network/linux_cgroups_relative_network.go similarity index 100% rename from validation/linux_cgroups_relative_network.go rename to validation/linux_cgroups_relative_network/linux_cgroups_relative_network.go diff --git a/validation/linux_cgroups_relative_pids.go b/validation/linux_cgroups_relative_pids/linux_cgroups_relative_pids.go similarity index 100% rename from validation/linux_cgroups_relative_pids.go rename to validation/linux_cgroups_relative_pids/linux_cgroups_relative_pids.go diff --git a/validation/linux_devices.go b/validation/linux_devices/linux_devices.go similarity index 100% rename from validation/linux_devices.go rename to validation/linux_devices/linux_devices.go diff --git a/validation/linux_masked_paths.go b/validation/linux_masked_paths/linux_masked_paths.go similarity index 100% rename from validation/linux_masked_paths.go rename to validation/linux_masked_paths/linux_masked_paths.go diff --git a/validation/linux_ns_itype.go b/validation/linux_ns_itype/linux_ns_itype.go similarity index 100% rename from validation/linux_ns_itype.go rename to validation/linux_ns_itype/linux_ns_itype.go diff --git a/validation/linux_ns_nopath.go b/validation/linux_ns_nopath/linux_ns_nopath.go similarity index 100% rename from validation/linux_ns_nopath.go rename to validation/linux_ns_nopath/linux_ns_nopath.go diff --git a/validation/linux_ns_path.go b/validation/linux_ns_path/linux_ns_path.go similarity index 100% rename from validation/linux_ns_path.go rename to validation/linux_ns_path/linux_ns_path.go diff --git a/validation/linux_ns_path_type.go b/validation/linux_ns_path_type/linux_ns_path_type.go similarity index 100% rename from validation/linux_ns_path_type.go rename to validation/linux_ns_path_type/linux_ns_path_type.go diff --git a/validation/linux_readonly_paths.go b/validation/linux_readonly_paths/linux_readonly_paths.go similarity index 100% rename from validation/linux_readonly_paths.go rename to validation/linux_readonly_paths/linux_readonly_paths.go diff --git a/validation/linux_rootfs_propagation.go b/validation/linux_rootfs_propagation/linux_rootfs_propagation.go similarity index 100% rename from validation/linux_rootfs_propagation.go rename to validation/linux_rootfs_propagation/linux_rootfs_propagation.go diff --git a/validation/linux_seccomp.go b/validation/linux_seccomp/linux_seccomp.go similarity index 100% rename from validation/linux_seccomp.go rename to validation/linux_seccomp/linux_seccomp.go diff --git a/validation/linux_sysctl.go b/validation/linux_sysctl/linux_sysctl.go similarity index 100% rename from validation/linux_sysctl.go rename to validation/linux_sysctl/linux_sysctl.go diff --git a/validation/linux_uid_mappings.go b/validation/linux_uid_mappings/linux_uid_mappings.go similarity index 100% rename from validation/linux_uid_mappings.go rename to validation/linux_uid_mappings/linux_uid_mappings.go diff --git a/validation/misc_props.go b/validation/misc_props/misc_props.go similarity index 100% rename from validation/misc_props.go rename to validation/misc_props/misc_props.go diff --git a/validation/mounts.go b/validation/mounts/mounts.go similarity index 100% rename from validation/mounts.go rename to validation/mounts/mounts.go diff --git a/validation/pidfile.go b/validation/pidfile/pidfile.go similarity index 100% rename from validation/pidfile.go rename to validation/pidfile/pidfile.go diff --git a/validation/poststart.go b/validation/poststart/poststart.go similarity index 100% rename from validation/poststart.go rename to validation/poststart/poststart.go diff --git a/validation/poststart_fail.go b/validation/poststart_fail/poststart_fail.go similarity index 100% rename from validation/poststart_fail.go rename to validation/poststart_fail/poststart_fail.go diff --git a/validation/poststop.go b/validation/poststop/poststop.go similarity index 100% rename from validation/poststop.go rename to validation/poststop/poststop.go diff --git a/validation/poststop_fail.go b/validation/poststop_fail/poststop_fail.go similarity index 100% rename from validation/poststop_fail.go rename to validation/poststop_fail/poststop_fail.go diff --git a/validation/prestart.go b/validation/prestart/prestart.go similarity index 100% rename from validation/prestart.go rename to validation/prestart/prestart.go diff --git a/validation/prestart_fail.go b/validation/prestart_fail/prestart_fail.go similarity index 100% rename from validation/prestart_fail.go rename to validation/prestart_fail/prestart_fail.go diff --git a/validation/process.go b/validation/process/process.go similarity index 100% rename from validation/process.go rename to validation/process/process.go diff --git a/validation/process_capabilities.go b/validation/process_capabilities/process_capabilities.go similarity index 100% rename from validation/process_capabilities.go rename to validation/process_capabilities/process_capabilities.go diff --git a/validation/process_capabilities_fail.go b/validation/process_capabilities_fail/process_capabilities_fail.go similarity index 100% rename from validation/process_capabilities_fail.go rename to validation/process_capabilities_fail/process_capabilities_fail.go diff --git a/validation/process_oom_score_adj.go b/validation/process_oom_score_adj/process_oom_score_adj.go similarity index 100% rename from validation/process_oom_score_adj.go rename to validation/process_oom_score_adj/process_oom_score_adj.go diff --git a/validation/process_rlimits.go b/validation/process_rlimits/process_rlimits.go similarity index 100% rename from validation/process_rlimits.go rename to validation/process_rlimits/process_rlimits.go diff --git a/validation/process_rlimits_fail.go b/validation/process_rlimits_fail/process_rlimits_fail.go similarity index 100% rename from validation/process_rlimits_fail.go rename to validation/process_rlimits_fail/process_rlimits_fail.go diff --git a/validation/process_user.go b/validation/process_user/process_user.go similarity index 100% rename from validation/process_user.go rename to validation/process_user/process_user.go diff --git a/validation/root_readonly_true.go b/validation/root_readonly_true/root_readonly_true.go similarity index 100% rename from validation/root_readonly_true.go rename to validation/root_readonly_true/root_readonly_true.go diff --git a/validation/start.go b/validation/start/start.go similarity index 100% rename from validation/start.go rename to validation/start/start.go diff --git a/validation/state.go b/validation/state/state.go similarity index 100% rename from validation/state.go rename to validation/state/state.go