diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml index cd056f62..827ae38b 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml @@ -109,9 +109,9 @@ - present_1_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_1 is changed - present_1.containers | length == 1 - - present_1.containers[0].Name == pname ~ '-' ~ cname ~ '-1' + - present_1.containers[0].Name == (pname ~ '-' ~ cname ~ '-1') - present_1.images | length == 1 - - present_1.images[0].ContainerName == pname ~ '-' ~ cname ~ '-1' + - present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == iname - present_1.images[0].Tag == "latest" - present_1.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml index bdf0c0c2..7cac56e0 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml @@ -57,12 +57,12 @@ - present_1_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_1 is failed - present_1.containers | length == 1 - - present_1.containers[0].Name == pname ~ '-' ~ cname ~ '-1' + - present_1.containers[0].Name == (pname ~ '-' ~ cname ~ '-1') - present_1.containers[0].Image == docker_test_image_alpine - present_1.containers[0].State == 'exited' - present_1.containers[0].ExitCode == 0 - present_1.images | length == 1 - - present_1.images[0].ContainerName == pname ~ '-' ~ cname ~ '-1' + - present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == (docker_test_image_alpine | split(':') | first) - present_1.images[0].Tag == (docker_test_image_alpine | split(':') | last) - present_1.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml index 27eab647..5c6cad0c 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml @@ -80,10 +80,10 @@ - present_1_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_1 is changed - present_1.containers | length == 1 - - present_1.containers[0].Name == pname ~ '-' ~ cname ~ '-1' + - present_1.containers[0].Name == (pname ~ '-' ~ cname ~ '-1') - present_1.containers[0].Image == docker_test_image_alpine - present_1.images | length == 1 - - present_1.images[0].ContainerName == pname ~ '-' ~ cname ~ '-1' + - present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == (docker_test_image_alpine | split(':') | first) - present_1.images[0].Tag == (docker_test_image_alpine | split(':') | last) - present_1.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml index 9d0aa78a..8376b530 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml @@ -190,24 +190,24 @@ - assert: that: - present_1_check is changed - - present_1_check.actions | selectattr('status', 'eq', 'Pulling') | first - - present_1_check.actions | selectattr('status', 'eq', 'Creating') | first + - (present_1_check.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy + - (present_1_check.actions | selectattr('status', 'eq', 'Creating') | first) is truthy - present_1_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_1 is changed - - present_1.actions | selectattr('status', 'eq', 'Pulling') | first - - present_1.actions | selectattr('status', 'eq', 'Creating') | first + - (present_1.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy + - (present_1.actions | selectattr('status', 'eq', 'Creating') | first) is truthy - present_1.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_2_check is not changed - present_2_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_2 is not changed - present_2.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_3_check is changed - - present_3_check.actions | selectattr('status', 'eq', 'Pulling') | first + - (present_3_check.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - present_3_check.actions | selectattr('status', 'eq', 'Creating') | length == 0 - present_3_check.actions | selectattr('status', 'eq', 'Recreating') | length == 0 - present_3_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_3 is not changed - - present_3.actions | selectattr('status', 'eq', 'Pulling') | first + - (present_3.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - present_3.actions | selectattr('status', 'eq', 'Creating') | length == 0 - present_3.actions | selectattr('status', 'eq', 'Recreating') | length == 0 - present_3.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml index 208bc404..af9a68aa 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml @@ -90,10 +90,10 @@ - present_1_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_1 is changed - present_1.containers | length == 1 - - present_1.containers[0].Name == pname ~ '-' ~ cname ~ '-1' + - present_1.containers[0].Name == (pname ~ '-' ~ cname ~ '-1') - present_1.containers[0].Image == docker_test_image_alpine - present_1.images | length == 1 - - present_1.images[0].ContainerName == pname ~ '-' ~ cname ~ '-1' + - present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == (docker_test_image_alpine | split(':') | first) - present_1.images[0].Tag == (docker_test_image_alpine | split(':') | last) - present_1.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 diff --git a/tests/integration/targets/docker_compose_v2_pull/tasks/tests/pull.yml b/tests/integration/targets/docker_compose_v2_pull/tasks/tests/pull.yml index b0bb8bc9..f6f5d1a6 100644 --- a/tests/integration/targets/docker_compose_v2_pull/tasks/tests/pull.yml +++ b/tests/integration/targets/docker_compose_v2_pull/tasks/tests/pull.yml @@ -140,26 +140,26 @@ - assert: that: - pull_1_check is changed - - pull_1_check.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_1_check.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_1_check.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_1 is changed - - pull_1.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_1.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_1.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_2_check is not changed - pull_2_check.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_2 is not changed - pull_2.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_3_check is changed - - pull_3_check.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_3_check.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_3_check.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_3 is changed - - pull_3.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_3.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_3.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_4_check is changed - - pull_4_check.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_4_check.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_4_check.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_4 is not changed - - pull_4.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_4.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_4.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - when: docker_compose_version is version('2.22.0', '<') @@ -193,14 +193,14 @@ - assert: that: - pull_1_check is changed - - pull_1_check.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_1_check.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_1_check.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_1 is changed - - pull_1.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_1.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_1.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_2_check is changed - - pull_2_check.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_2_check.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_2_check.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 - pull_2 is not changed - - pull_2.actions | selectattr('status', 'eq', 'Pulling') | first + - (pull_2.actions | selectattr('status', 'eq', 'Pulling') | first) is truthy - pull_2.warnings | default([]) | select('regex', 'Cannot parse event from ') | length == 0 diff --git a/tests/integration/targets/docker_container/tasks/tests/network.yml b/tests/integration/targets/docker_container/tasks/tests/network.yml index 42ebef65..e731ec47 100644 --- a/tests/integration/targets/docker_container/tasks/tests/network.yml +++ b/tests/integration/targets/docker_container/tasks/tests/network.yml @@ -141,9 +141,9 @@ - network_mode_3 is changed - network_mode_3.container.HostConfig.NetworkMode == 'none' - network_mode_4 is changed - - network_mode_4.container.HostConfig.NetworkMode == 'container:' ~ cname_h1_id.container.Id + - network_mode_4.container.HostConfig.NetworkMode == ('container:' ~ cname_h1_id.container.Id) - network_mode_5 is not changed - - network_mode_5.container.HostConfig.NetworkMode == 'container:' ~ cname_h1_id.container.Id + - network_mode_5.container.HostConfig.NetworkMode == ('container:' ~ cname_h1_id.container.Id) #################################################################### ## networks, purge_networks for networks_cli_compatible=no ######### diff --git a/tests/integration/targets/docker_container/tasks/tests/options.yml b/tests/integration/targets/docker_container/tasks/tests/options.yml index d49b1a6f..0c1223c1 100644 --- a/tests/integration/targets/docker_container/tasks/tests/options.yml +++ b/tests/integration/targets/docker_container/tasks/tests/options.yml @@ -93,7 +93,8 @@ that: - blkio_weight_1 is changed - blkio_weight_2 is not failed - - "blkio_weight_2 is not changed or 'Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (blkio_weight_2.warnings | default([]))" + - >- + blkio_weight_2 is not changed or ('Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (blkio_weight_2.warnings | default([]))) - blkio_weight_3 is not failed - blkio_weight_3 is changed @@ -210,7 +211,7 @@ - cgroupns_mode_2 is not changed and cgroupns_mode_2 is not failed - >- cgroupns_mode_3 is changed or - 'Docker warning: Your kernel does not support cgroup namespaces. Cgroup namespace setting discarded.' in (cgroupns_mode_3.warnings | default([])) or + ('Docker warning: Your kernel does not support cgroup namespaces. Cgroup namespace setting discarded.' in (cgroupns_mode_3.warnings | default([]))) or (cgroupns_mode_3 is failed and 'error mounting "cgroup" to rootfs at "/sys/fs/cgroup"' in cgroupns_mode_3.msg) when: docker_api_version is version('1.41', '>=') and cgroupns_mode_1 is not failed - assert: @@ -2800,7 +2801,8 @@ - kernel_memory_3 is changed when: - kernel_memory_1 is not failed or 'kernel memory accounting disabled in this runc build' not in kernel_memory_1.msg - - "'Docker warning: Specifying a kernel memory limit is deprecated and will be removed in a future release.' not in (kernel_memory_1.warnings | default([]))" + - >- + 'Docker warning: Specifying a kernel memory limit is deprecated and will be removed in a future release.' not in (kernel_memory_1.warnings | default([])) # API version 1.42 seems to remove the kernel memory option completely - "'KernelMemory' in kernel_memory_1.container.HostConfig or docker_api_version is version('1.42', '<')" @@ -3344,7 +3346,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau - memory_swappiness_1 is changed - memory_swappiness_2 is not changed - memory_swappiness_3 is changed - when: "'Docker warning: Your kernel does not support memory swappiness capabilities or the cgroup is not mounted. Memory swappiness discarded.' not in (memory_swappiness_1.warnings | default([]))" + when: >- + 'Docker warning: Your kernel does not support memory swappiness capabilities or the cgroup is not mounted. Memory swappiness discarded.' not in (memory_swappiness_1.warnings | default([])) #################################################################### ## oom_killer ###################################################### @@ -3390,7 +3393,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau - oom_killer_1 is changed - oom_killer_2 is not changed - oom_killer_3 is changed - when: "'Docker warning: Your kernel does not support OomKillDisable. OomKillDisable discarded.' not in (oom_killer_1.warnings | default([]))" + when: >- + 'Docker warning: Your kernel does not support OomKillDisable. OomKillDisable discarded.' not in (oom_killer_1.warnings | default([])) #################################################################### ## oom_score_adj ################################################### @@ -3436,7 +3440,8 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau - oom_score_adj_1 is changed - oom_score_adj_2 is not changed - oom_score_adj_3 is changed - when: "'Docker warning: Your kernel does not support OomScoreAdj. OomScoreAdj discarded.' not in (oom_score_adj_1.warnings | default([]))" + when: >- + 'Docker warning: Your kernel does not support OomScoreAdj. OomScoreAdj discarded.' not in (oom_score_adj_1.warnings | default([])) #################################################################### ## output_logs ##################################################### diff --git a/tests/integration/targets/docker_container/tasks/tests/update.yml b/tests/integration/targets/docker_container/tasks/tests/update.yml index a180e0f5..7ebdcf83 100644 --- a/tests/integration/targets/docker_container/tasks/tests/update.yml +++ b/tests/integration/targets/docker_container/tasks/tests/update.yml @@ -147,7 +147,8 @@ assert: that: # blkio_weight sometimes cannot be set, then we end up with 0 instead of the value we had - - not has_blkio_weight or update.diff.before.blkio_weight == 123 or 'Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (create.warnings | default([])) + - >- + not has_blkio_weight or update.diff.before.blkio_weight == 123 or ('Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (create.warnings | default([]))) - not has_blkio_weight or update.diff.after.blkio_weight == 234 - update.diff.before.cpu_period == 90000 - update.diff.after.cpu_period == 50000 @@ -159,8 +160,10 @@ - update.diff.after.memory == 50331648 - update.diff.before.memory_reservation == 67108864 - update.diff.after.memory_reservation == 50331648 - - (update.diff.before.memory_swap | default(0)) == 67108864 or 'Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([])) - - (update.diff.after.memory_swap | default(0)) == -1 or 'Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([])) + - >- + (update.diff.before.memory_swap | default(0)) == 67108864 or ('Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([]))) + - >- + (update.diff.after.memory_swap | default(0)) == -1 or ('Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([]))) - "'restart_policy' not in update.diff.before" - update.diff.before.restart_retries == 5 - update.diff.after.restart_retries == 2 @@ -168,7 +171,8 @@ - name: Check diff for second update assert: that: - - not has_blkio_weight or update2.diff.before.blkio_weight == 234 or 'Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (create.warnings | default([])) + - >- + not has_blkio_weight or update2.diff.before.blkio_weight == 234 or ('Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (create.warnings | default([]))) - not has_blkio_weight or update2.diff.after.blkio_weight == 135 - update2.diff.before.cpu_period == 50000 - update2.diff.after.cpu_period == 30000 @@ -180,8 +184,10 @@ - update2.diff.after.memory == 33554432 - update2.diff.before.memory_reservation == 50331648 - update2.diff.after.memory_reservation == 31457280 - - (update2.diff.before.memory_swap | default(0)) == -1 or 'Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([])) - - (update2.diff.after.memory_swap | default(0)) == 134217728 or 'Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([])) + - >- + (update2.diff.before.memory_swap | default(0)) == -1 or ('Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([]))) + - >- + (update2.diff.after.memory_swap | default(0)) == 134217728 or ('Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([]))) - update2.diff.before.restart_policy == 'on-failure' - update2.diff.after.restart_policy == 'always' - update2.diff.before.restart_retries == 2 @@ -190,7 +196,8 @@ - name: Check diff for recreation assert: that: - - not has_blkio_weight or recreate.diff.before.blkio_weight == 135 or 'Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (create.warnings | default([])) + - >- + not has_blkio_weight or recreate.diff.before.blkio_weight == 135 or ('Docker warning: Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.' in (create.warnings | default([]))) - not has_blkio_weight or recreate.diff.after.blkio_weight == 234 - recreate.diff.before.cpu_period == 30000 - recreate.diff.after.cpu_period == 50000 @@ -202,8 +209,10 @@ - recreate.diff.after.memory == 50331648 - recreate.diff.before.memory_reservation == 31457280 - recreate.diff.after.memory_reservation == 50331648 - - (recreate.diff.before.memory_swap | default(0)) == 134217728 or 'Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([])) - - (recreate.diff.after.memory_swap | default(0)) == -1 or 'Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([])) + - >- + (recreate.diff.before.memory_swap | default(0)) == 134217728 or ('Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([]))) + - >- + (recreate.diff.after.memory_swap | default(0)) == -1 or ('Docker warning: Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.' in (create.warnings | default([]))) - recreate.diff.before.restart_policy == 'always' - recreate.diff.after.restart_policy == 'on-failure' - recreate.diff.before.restart_retries == 0 diff --git a/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml b/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml index 5431ae35..b6fca448 100644 --- a/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml +++ b/tests/integration/targets/docker_container_copy_into/tasks/tests/file.yml @@ -225,7 +225,7 @@ - result_1_diff.diff.before == '' - result_1_diff.diff.before_header == '/file' - result_1_diff.diff.after == 'Content 1\n' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is changed - result_3 is not changed @@ -233,7 +233,7 @@ - result_3_diff.diff.before == 'Content 1\n' - result_3_diff.diff.before_header == '/file' - result_3_diff.diff.after == 'Content 1\n' - - result_3_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_3_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_3 == (result_3_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_4 is not changed - result_5.stdout | b64decode == 'Content 1\n' @@ -243,7 +243,7 @@ - result_6_diff.diff.before == 'Content 1\n' - result_6_diff.diff.before_header == '/file' - result_6_diff.diff.after == 'Content 1\n' - - result_6_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_6_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_6 == (result_6_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_7 is changed - result_8.stdout | b64decode == 'Content 1\n' @@ -369,7 +369,7 @@ - result_1_diff.diff.before == 'Content 1\n' - result_1_diff.diff.before_header == '/file' - result_1_diff.diff.after == 'Content 1\n' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is not changed - result_2.container_path == '/file' @@ -382,7 +382,7 @@ - result_4_diff.diff.before == 'Content 1\n' - result_4_diff.diff.before_header == '/file' - result_4_diff.diff.after == 'Content 1\n' - - result_4_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_4_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_4 == (result_4_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_5 is changed - result_5.container_path == '/file' @@ -506,7 +506,7 @@ - result_1_diff.diff.before == '/file' - result_1_diff.diff.before_header == '/lnk' - result_1_diff.diff.after == 'Content 1\n' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is changed - result_2.container_path == '/lnk' @@ -515,7 +515,7 @@ - result_3_diff.diff.before == 'Content 1\n' - result_3_diff.diff.before_header == '/lnk' - result_3_diff.diff.after == 'Content 1\n' - - result_3_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_3_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_3 == (result_3_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_4 is not changed - result_5.stdout | b64decode == 'Content 1\n' @@ -526,7 +526,7 @@ - result_6_diff.diff.before == 'Content 1\n' - result_6_diff.diff.before_header == '/lnk' - result_6_diff.diff.after == 'Content 1\n' - - result_6_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_6_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_6 == (result_6_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_7 is changed - result_7.container_path == '/lnk' @@ -609,7 +609,7 @@ - result_1_diff.diff.before == '(directory)' - result_1_diff.diff.before_header == '/dir' - result_1_diff.diff.after == 'Content 1\n' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is changed - result_2.container_path == '/dir' @@ -618,7 +618,7 @@ - result_3_diff.diff.before == 'Content 1\n' - result_3_diff.diff.before_header == '/dir' - result_3_diff.diff.after == 'Content 1\n' - - result_3_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_3_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_3 == (result_3_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_4 is not changed - result_5.stdout | b64decode == 'Content 1\n' @@ -671,7 +671,7 @@ - result_1_diff.diff.before == 'Content 1\n' - result_1_diff.diff.before_header == '/file' - result_1_diff.diff.after == 'Content 2\nExtra line' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_2' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_2') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is changed - result_3.stdout | b64decode == 'Content 2\nExtra line' @@ -755,7 +755,7 @@ - result_1_diff.diff.before == 'Content 2\nExtra line' - result_1_diff.diff.before_header == '/file' - result_1_diff.diff.after == 'Content 2\nExtra line' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_2' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_2') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is changed - result_3 is not changed @@ -763,7 +763,7 @@ - result_3_diff.diff.before == 'Content 2\nExtra line' - result_3_diff.diff.before_header == '/file' - result_3_diff.diff.after == 'Content 2\nExtra line' - - result_3_diff.diff.after_header == remote_tmp_dir ~ '/file_2' + - result_3_diff.diff.after_header == (remote_tmp_dir ~ '/file_2') - result_3 == (result_3_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_4 is not changed - result_5.stdout | b64decode == 'Content 2\nExtra line' @@ -905,7 +905,7 @@ - result_1_diff.diff.before == 'Content 2\nExtra line' - result_1_diff.diff.before_header == '/file' - result_1_diff.diff.after == 'Content 2\nExtra line' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_2' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_2') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is changed - result_3 is not changed @@ -913,7 +913,7 @@ - result_3_diff.diff.before == 'Content 2\nExtra line' - result_3_diff.diff.before_header == '/file' - result_3_diff.diff.after == 'Content 2\nExtra line' - - result_3_diff.diff.after_header == remote_tmp_dir ~ '/file_2' + - result_3_diff.diff.after_header == (remote_tmp_dir ~ '/file_2') - result_3 == (result_3_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_4 is not changed - result_5.stdout | b64decode == 'Content 2\nExtra line' @@ -923,7 +923,7 @@ - result_6_diff.diff.before == 'Content 2\nExtra line' - result_6_diff.diff.before_header == '/file' - result_6_diff.diff.after == 'Content 2\nExtra line' - - result_6_diff.diff.after_header == remote_tmp_dir ~ '/file_2' + - result_6_diff.diff.after_header == (remote_tmp_dir ~ '/file_2') - result_6 == (result_6_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_7 is changed - result_8.stdout | b64decode == 'Content 2\nExtra line' @@ -1039,7 +1039,7 @@ - result_1_diff.diff.before == 'Content 2\nExtra line' - result_1_diff.diff.before_header == '/file' - result_1_diff.diff.after == 'Content 1\n' - - result_1_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_1_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_1 == (result_1_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_2 is changed - result_3 is not changed @@ -1047,7 +1047,7 @@ - result_3_diff.diff.before == 'Content 1\n' - result_3_diff.diff.before_header == '/file' - result_3_diff.diff.after == 'Content 1\n' - - result_3_diff.diff.after_header == remote_tmp_dir ~ '/file_1' + - result_3_diff.diff.after_header == (remote_tmp_dir ~ '/file_1') - result_3 == (result_3_diff | dict2items | rejectattr('key', 'eq', 'diff') | items2dict) - result_4 is not changed - result_5 is failed diff --git a/tests/integration/targets/docker_container_exec/tasks/main.yml b/tests/integration/targets/docker_container_exec/tasks/main.yml index 61c3b81e..784e8386 100644 --- a/tests/integration/targets/docker_container_exec/tasks/main.yml +++ b/tests/integration/targets/docker_container_exec/tasks/main.yml @@ -168,7 +168,7 @@ that: - result is changed - result.rc == 0 - - result.stdout == very_long_string ~ '\n' ~ very_long_string2 + - result.stdout == (very_long_string ~ '\n' ~ very_long_string2) - result.stdout_lines == [very_long_string, very_long_string2] - result.stderr == '' - result.stderr_lines == [] diff --git a/tests/integration/targets/docker_container_info/tasks/main.yml b/tests/integration/targets/docker_container_info/tasks/main.yml index 2df597eb..2d97e67d 100644 --- a/tests/integration/targets/docker_container_info/tasks/main.yml +++ b/tests/integration/targets/docker_container_info/tasks/main.yml @@ -60,7 +60,7 @@ that: - result.exists - "'container' in result" - - "result.container" + - "result.container is truthy" - assert: that: diff --git a/tests/integration/targets/docker_image/tasks/tests/options.yml b/tests/integration/targets/docker_image/tasks/tests/options.yml index b8f6c700..bce63262 100644 --- a/tests/integration/targets/docker_image/tasks/tests/options.yml +++ b/tests/integration/targets/docker_image/tasks/tests/options.yml @@ -355,7 +355,7 @@ - load_image_1 is not changed - load_image_2 is failed - >- - "The archive did not contain image 'foo:bar'. Instead, found '" ~ docker_test_image_hello_world ~ "'." == load_image_2.msg + ("The archive did not contain image 'foo:bar'. Instead, found '" ~ docker_test_image_hello_world ~ "'.") == load_image_2.msg - load_image_3 is failed - '"Detected no loaded images. Archive potentially corrupt?" == load_image_3.msg' - load_image_4 is not changed diff --git a/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml b/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml index 774917d5..de337917 100644 --- a/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml @@ -119,32 +119,32 @@ that: - present_1_check is changed - present_1_check.actions | length == 1 - - present_1_check.actions[0] == 'Pulled image ' ~ image_name + - present_1_check.actions[0] == ('Pulled image ' ~ image_name) - present_1_check.diff.before.exists is false - present_1_check.diff.after.id == 'unknown' - present_1 is changed - present_1.actions | length == 1 - - present_1.actions[0] == 'Pulled image ' ~ image_name + - present_1.actions[0] == ('Pulled image ' ~ image_name) - present_1.diff.before.exists is false - present_1.diff.after.id is string - present_2_check is changed - present_2_check.actions | length == 1 - - present_2_check.actions[0] == 'Pulled image ' ~ image_name + - present_2_check.actions[0] == ('Pulled image ' ~ image_name) - present_2_check.diff.before.id == present_1.diff.after.id - present_2_check.diff.after.id == 'unknown' - present_2 is not changed - present_2.actions | length == 1 - - present_2.actions[0] == 'Pulled image ' ~ image_name + - present_2.actions[0] == ('Pulled image ' ~ image_name) - present_2.diff.before.id == present_1.diff.after.id - present_2.diff.after.id == present_1.diff.after.id - present_3_check is changed - present_3_check.actions | length == 1 - - present_3_check.actions[0] == 'Pulled image ' ~ image_name + - present_3_check.actions[0] == ('Pulled image ' ~ image_name) - present_3_check.diff.before.id == present_1.diff.after.id - present_3_check.diff.after.id == 'unknown' - present_3 is changed - present_3.actions | length == 1 - - present_3.actions[0] == 'Pulled image ' ~ image_name + - present_3.actions[0] == ('Pulled image ' ~ image_name) - present_3.diff.before.id == present_1.diff.after.id - present_3.diff.after.id != present_1.diff.after.id - present_3.diff.after.id is string @@ -158,12 +158,12 @@ - present_4.diff.after.id == present_3.diff.after.id - present_5_check is changed - present_5_check.actions | length == 1 - - present_5_check.actions[0] == 'Pulled image ' ~ image_name + - present_5_check.actions[0] == ('Pulled image ' ~ image_name) - present_5_check.diff.before.id == present_3.diff.after.id - present_5_check.diff.after.id == 'unknown' - present_5 is changed - present_5.actions | length == 1 - - present_5.actions[0] == 'Pulled image ' ~ image_name + - present_5.actions[0] == ('Pulled image ' ~ image_name) - present_5.diff.before.id == present_3.diff.after.id - present_5.diff.after.id == present_1.diff.after.id diff --git a/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml b/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml index dd092a8b..bdbc93a2 100644 --- a/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml +++ b/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml @@ -37,12 +37,12 @@ that: - present_1 is changed - present_1.actions | length == 1 - - present_1.actions[0] == 'Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v1 + - present_1.actions[0] == ('Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v1) - present_1.diff.before.exists is false - present_1.diff.after.id is string - present_2 is not changed - present_2.actions | length == 1 - - present_2.actions[0] == 'Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v1 + - present_2.actions[0] == ('Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v1) - present_2.diff.before.id == present_1.diff.after.id - present_2.diff.after.id == present_1.diff.after.id - present_3 is not changed @@ -69,12 +69,12 @@ that: - present_4 is changed - present_4.actions | length == 1 - - present_4.actions[0] == 'Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v2 + - present_4.actions[0] == ('Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v2) - present_4.diff.before.exists is false - present_4.diff.after.id == 'unknown' - present_5 is changed - present_5.actions | length == 1 - - present_5.actions[0] == 'Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v2 + - present_5.actions[0] == ('Pulled image ' ~ docker_test_image_digest_base ~ ':sha256:' ~ docker_test_image_digest_v2) - present_5.diff.before.exists is false - present_5.diff.after.id != present_1.diff.after.id - present_5.diff.after.id is string diff --git a/tests/integration/targets/docker_image_push/tasks/tests/registry.yml b/tests/integration/targets/docker_image_push/tasks/tests/registry.yml index ca18d196..4f15490d 100644 --- a/tests/integration/targets/docker_image_push/tasks/tests/registry.yml +++ b/tests/integration/targets/docker_image_push/tasks/tests/registry.yml @@ -79,4 +79,5 @@ - assert: that: - push_4 is failed - - push_4.msg == 'Error pushing image ' ~ image_name_base2 ~ ':' ~ image_tag ~ ': no basic auth credentials' + - >- + push_4.msg == ('Error pushing image ' ~ image_name_base2 ~ ':' ~ image_tag ~ ': no basic auth credentials') diff --git a/tests/integration/targets/docker_image_remove/tasks/main.yml b/tests/integration/targets/docker_image_remove/tasks/main.yml index afa72da8..7643e3a3 100644 --- a/tests/integration/targets/docker_image_remove/tasks/main.yml +++ b/tests/integration/targets/docker_image_remove/tasks/main.yml @@ -108,7 +108,7 @@ - remove_2.diff.after.digests | length == 1 - remove_2.deleted | length == 0 - remove_2.untagged | length == 1 - - remove_2.untagged[0] == iname_prefix ~ '-tagged-1:latest' + - remove_2.untagged[0] == (iname_prefix ~ '-tagged-1:latest') - remove_2_check.deleted == remove_2.deleted - remove_2_check.untagged == remove_2.untagged - info_2.images | length == 0 @@ -180,7 +180,7 @@ - remove_4.diff.after.digests | length == 1 - remove_4.deleted | length == 0 - remove_4.untagged | length == 1 - - remove_4.untagged[0] == iname_prefix ~ '-tagged-1:foo' + - remove_4.untagged[0] == (iname_prefix ~ '-tagged-1:foo') - remove_4_check.deleted == remove_4.deleted - remove_4_check.untagged == remove_4.untagged - info_3.images | length == 2 diff --git a/tests/integration/targets/docker_image_tag/tasks/main.yml b/tests/integration/targets/docker_image_tag/tasks/main.yml index 32791748..79a2751d 100644 --- a/tests/integration/targets/docker_image_tag/tasks/main.yml +++ b/tests/integration/targets/docker_image_tag/tasks/main.yml @@ -373,7 +373,7 @@ that: - tag_11 is failed - >- - tag_11.msg == 'repository[1] must not have a digest; got: ' ~ iname_prefix ~ '-tagged-2@sha256:' ~ docker_test_image_digest_v1 + tag_11.msg == ('repository[1] must not have a digest; got: ' ~ iname_prefix ~ '-tagged-2@sha256:' ~ docker_test_image_digest_v1) - name: Tag image 3 (fail because of image ID) docker_image_tag: @@ -388,7 +388,7 @@ that: - tag_12 is failed - >- - tag_12.msg == 'repository[1] must not be an image ID; got: sha256:' ~ docker_test_image_digest_v1 + tag_12.msg == ('repository[1] must not be an image ID; got: sha256:' ~ docker_test_image_digest_v1) always: - name: Remove tagged images diff --git a/tests/integration/targets/docker_network_info/tasks/main.yml b/tests/integration/targets/docker_network_info/tasks/main.yml index 910b4ec8..a12154ca 100644 --- a/tests/integration/targets/docker_network_info/tasks/main.yml +++ b/tests/integration/targets/docker_network_info/tasks/main.yml @@ -63,7 +63,7 @@ that: - result.exists - "'network' in result" - - "result.network" + - "result.network is truthy" - assert: that: diff --git a/tests/integration/targets/docker_node/tasks/test_node.yml b/tests/integration/targets/docker_node/tasks/test_node.yml index c326fc9f..41ee1837 100644 --- a/tests/integration/targets/docker_node/tasks/test_node.yml +++ b/tests/integration/targets/docker_node/tasks/test_node.yml @@ -30,9 +30,9 @@ assert: that: - 'output is changed' - - 'output.actions[0] | regex_search("New Swarm cluster created: ")' - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' + - '(output.actions[0] | regex_search("New Swarm cluster created: ")) is truthy' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' - name: Try to get docker_node_info when docker is running in swarm mode and as manager docker_node_info: @@ -113,7 +113,7 @@ that: - 'set_as_worker_1 is changed' - 'set_as_worker_2 is failed' - - 'set_as_worker_2.msg | regex_search("attempting to demote the last manager of the swarm")' + - '(set_as_worker_2.msg | regex_search("attempting to demote the last manager of the swarm")) is truthy' #################################################################### ## Set node as pasued ############################################## diff --git a/tests/integration/targets/docker_node_info/tasks/test_node_info.yml b/tests/integration/targets/docker_node_info/tasks/test_node_info.yml index 9a89a2a1..7bfd588f 100644 --- a/tests/integration/targets/docker_node_info/tasks/test_node_info.yml +++ b/tests/integration/targets/docker_node_info/tasks/test_node_info.yml @@ -30,9 +30,9 @@ assert: that: - 'output is changed' - - 'output.actions[0] | regex_search("New Swarm cluster created: ")' - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' + - '(output.actions[0] | regex_search("New Swarm cluster created: ")) is truthy' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' - name: Try to get docker_node_info when docker is running in swarm mode and as manager docker_node_info: diff --git a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml index 79d524e5..46fc28af 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml @@ -91,9 +91,9 @@ - 'output_1.diff.before is defined' - 'output_1.diff.after is defined' - 'output_2 is changed' - - 'output_2.actions[0] | regex_search("New Swarm cluster created: ")' - - 'output_2.swarm_facts.JoinTokens.Manager' - - 'output_2.swarm_facts.JoinTokens.Worker' + - '(output_2.actions[0] | regex_search("New Swarm cluster created: ")) is truthy' + - 'output_2.swarm_facts.JoinTokens.Manager is truthy' + - 'output_2.swarm_facts.JoinTokens.Worker is truthy' - 'output_2.diff.before is defined' - 'output_2.diff.after is defined' - 'output_3 is not changed' diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml index 86661ecb..304be8db 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml @@ -108,11 +108,11 @@ assert: that: - output_1 is changed - - 'output_1.actions[0] | regex_search("New Swarm cluster created: ")' + - '(output_1.actions[0] | regex_search("New Swarm cluster created: ")) is truthy' - output_1.diff.before is defined - output_1.diff.after is defined - output_2 is changed - - 'output_2.actions[0] | regex_search("New Swarm cluster created: ")' + - '(output_2.actions[0] | regex_search("New Swarm cluster created: ")) is truthy' - output_2.diff.before is defined - output_2.diff.after is defined - output_5 is changed diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options.yml b/tests/integration/targets/docker_swarm/tasks/tests/options.yml index f88aa3f4..24b46873 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options.yml @@ -110,10 +110,10 @@ - name: assert UnlockKey in swarm_facts assert: that: - - 'output_2.swarm_facts.UnlockKey' + - 'output_2.swarm_facts.UnlockKey is truthy' - 'output_3.swarm_facts.UnlockKey is none' - 'output_6.swarm_facts.UnlockKey is none' - - 'output_7.swarm_facts.UnlockKey' + - 'output_7.swarm_facts.UnlockKey is truthy' when: docker_py_version is version('2.7.0', '>=') - assert: diff --git a/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml b/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml index a2cd5f8f..3f081904 100644 --- a/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml +++ b/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml @@ -34,9 +34,9 @@ assert: that: - 'output is changed' - - 'output.actions[0] | regex_search("New Swarm cluster created: ")' - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' + - '(output.actions[0] | regex_search("New Swarm cluster created: ")) is truthy' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' - name: Try to get docker_swarm_info when docker is running in swarm mode and as manager docker_swarm_info: @@ -45,9 +45,9 @@ - name: assert creding docker swarm facts assert: that: - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' - - 'output.swarm_facts.ID' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' + - 'output.swarm_facts.ID is truthy' - 'output.can_talk_to_docker == true' - 'output.docker_swarm_active == true' - 'output.docker_swarm_manager == true' @@ -61,9 +61,9 @@ - name: assert reading swarm facts with list of nodes option assert: that: - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' - - 'output.swarm_facts.ID' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' + - 'output.swarm_facts.ID is truthy' - 'output.nodes[0].ID is string' - 'output.can_talk_to_docker == true' - 'output.docker_swarm_active == true' @@ -84,11 +84,11 @@ - name: assert reading swarm facts with list of nodes and versbose output options assert: that: - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' - - 'output.swarm_facts.ID' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' + - 'output.swarm_facts.ID is truthy' - 'output.nodes[0].ID is string' - - 'output.nodes[0].CreatedAt' + - 'output.nodes[0].CreatedAt is truthy' - 'output.can_talk_to_docker == true' - 'output.docker_swarm_active == true' - 'output.docker_swarm_manager == true' @@ -104,9 +104,9 @@ - name: assert reading reading swarm facts and using node filter (random node name) assert: that: - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' - - 'output.swarm_facts.ID' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' + - 'output.swarm_facts.ID is truthy' - 'output.nodes | length == 1' - 'output.can_talk_to_docker == true' - 'output.docker_swarm_active == true' @@ -127,9 +127,9 @@ - name: assert reading reading swarm facts and using node filter (random node name) assert: that: - - 'output.swarm_facts.JoinTokens.Manager' - - 'output.swarm_facts.JoinTokens.Worker' - - 'output.swarm_facts.ID' + - 'output.swarm_facts.JoinTokens.Manager is truthy' + - 'output.swarm_facts.JoinTokens.Worker is truthy' + - 'output.swarm_facts.ID is truthy' - 'output.nodes | length == 0' - 'output.can_talk_to_docker == true' - 'output.docker_swarm_active == true' diff --git a/tests/integration/targets/docker_volume_info/tasks/main.yml b/tests/integration/targets/docker_volume_info/tasks/main.yml index 09cb84d7..fc0a385c 100644 --- a/tests/integration/targets/docker_volume_info/tasks/main.yml +++ b/tests/integration/targets/docker_volume_info/tasks/main.yml @@ -60,7 +60,7 @@ that: - result.exists - "'volume' in result" - - "result.volume" + - "result.volume is truthy" - assert: that: diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py index 089d34e4..c9870207 100644 --- a/tests/unit/plugins/connection/test_docker.py +++ b/tests/unit/plugins/connection/test_docker.py @@ -57,4 +57,4 @@ class TestDockerConnectionClass(unittest.TestCase): self.dc._version = None self.dc.remote_user = 'foo' (self.assertRaisesRegexp if PY2 else self.assertRaisesRegex)( - AnsibleError, '^Docker version check (.*?) failed: ', self.dc._get_actual_user) + AnsibleError, '^Docker version check (.*?) failed:', self.dc._get_actual_user)