aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorClement Delafargue <clement.delafargue@fretlink.com>2020-06-30 15:46:41 +0200
committerClement Delafargue <clement.delafargue@fretlink.com>2020-06-30 16:26:19 +0200
commitdb630aaa8b261503076eb7320ee3cee5a5582be8 (patch)
tree3b1fa1a9e85d57dbf4f4071321f9011343f40ac6
parent545c41a6694ac5273dbfe1a0e119be04eaeef468 (diff)
downloadansible-clever-db630aaa8b261503076eb7320ee3cee5a5582be8.tar.gz
ansible-clever-db630aaa8b261503076eb7320ee3cee5a5582be8.tar.zst
ansible-clever-db630aaa8b261503076eb7320ee3cee5a5582be8.zip
fix(tests): use `! grep` instead of `grep -v`
`grep -v` makes sure a file contains other lines than the one that matched. This is different from `! grep` which makes sure the file does not contain a line that matched.
-rw-r--r--tests/test-configure-app.yml4
-rw-r--r--tests/test-restart-app.yml6
-rw-r--r--tests/test-scalability.yml4
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/test-configure-app.yml b/tests/test-configure-app.yml
index 15987fd..e9861a2 100644
--- a/tests/test-configure-app.yml
+++ b/tests/test-configure-app.yml
@@ -21,7 +21,7 @@
21 msg: "CC_RUN_COMMAND env variable should not be present in the environment dict" 21 msg: "CC_RUN_COMMAND env variable should not be present in the environment dict"
22 when: clever_env.CC_RUN_COMMAND is defined 22 when: clever_env.CC_RUN_COMMAND is defined
23 - name: Check stubbed commands 23 - name: Check stubbed commands
24 command: "{{ item.cmd }}" 24 shell: "{{ item.cmd }}"
25 ignore_errors: true 25 ignore_errors: true
26 vars: 26 vars:
27 display: "{{ item.display }}" 27 display: "{{ item.display }}"
@@ -34,7 +34,7 @@
34 display: "Expected 'clever domain' command to be called" 34 display: "Expected 'clever domain' command to be called"
35 - cmd: "grep drain ../clever-commands" 35 - cmd: "grep drain ../clever-commands"
36 display: "Expected 'clever drain' command to be called" 36 display: "Expected 'clever drain' command to be called"
37 - cmd: "grep -v restart ../clever-commands" 37 - cmd: "! grep restart ../clever-commands"
38 display: "Expected 'clever restart' command to NOT be called" 38 display: "Expected 'clever restart' command to NOT be called"
39 register: tests_results 39 register: tests_results
40 - name: show results 40 - name: show results
diff --git a/tests/test-restart-app.yml b/tests/test-restart-app.yml
index 4c13a14..bc880a8 100644
--- a/tests/test-restart-app.yml
+++ b/tests/test-restart-app.yml
@@ -15,16 +15,16 @@
15 clever_restart_only: true 15 clever_restart_only: true
16 post_tasks: 16 post_tasks:
17 - name: Check stubbed commands 17 - name: Check stubbed commands
18 command: "{{ item.cmd }}" 18 shell: "{{ item.cmd }}"
19 ignore_errors: true 19 ignore_errors: true
20 vars: 20 vars:
21 display: "{{ item.display }}" 21 display: "{{ item.display }}"
22 with_list: 22 with_list:
23 - cmd: "grep restart ../clever-commands" 23 - cmd: "grep restart ../clever-commands"
24 display: "Expected 'clever restart' command to be called" 24 display: "Expected 'clever restart' command to be called"
25 - cmd: "grep -v deploy ../clever-commands" 25 - cmd: "! grep deploy ../clever-commands"
26 display: "Expected 'clever deploy' command to NOT be called" 26 display: "Expected 'clever deploy' command to NOT be called"
27 - cmd: "grep -v scale ../clever-commands" 27 - cmd: "! grep scale ../clever-commands"
28 display: "Expected 'clever scale' command to NOT be called" 28 display: "Expected 'clever scale' command to NOT be called"
29 register: tests_results 29 register: tests_results
30 - name: show results 30 - name: show results
diff --git a/tests/test-scalability.yml b/tests/test-scalability.yml
index 6bb90d2..258beaf 100644
--- a/tests/test-scalability.yml
+++ b/tests/test-scalability.yml
@@ -29,7 +29,7 @@
29 flavors: { min: "nano", max: "XS" } 29 flavors: { min: "nano", max: "XS" }
30 post_tasks: 30 post_tasks:
31 - name: Check stubbed commands 31 - name: Check stubbed commands
32 command: "{{ item.cmd }}" 32 shell: "{{ item.cmd }}"
33 ignore_errors: true 33 ignore_errors: true
34 vars: 34 vars:
35 display: "{{ item.display }}" 35 display: "{{ item.display }}"
@@ -38,7 +38,7 @@
38 display: "Expected 'clever deploy' command to be called" 38 display: "Expected 'clever deploy' command to be called"
39 - cmd: "grep scale ../clever-commands" 39 - cmd: "grep scale ../clever-commands"
40 display: "Expected 'clever scale' command to be called" 40 display: "Expected 'clever scale' command to be called"
41 - cmd: "grep -v restart ../clever-commands" 41 - cmd: "! grep restart ../clever-commands"
42 display: "Expected 'clever restart' command to NOT be called" 42 display: "Expected 'clever restart' command to NOT be called"
43 register: tests_results 43 register: tests_results
44 - name: show results 44 - name: show results