From c5183d416da1f6765f999e6dc49d7f6cdf2a60c9 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 7 Jan 2019 14:01:32 +0000
Subject: [PATCH] Use is instead of | for tests
Newer ansible wants us to use is. Also, it reads more nicer.
Change-Id: I368369d146a422abbf94265036a7d280e47eedc0
---
tests/configure-unbound.yaml | 6 +++---
tests/ensure-output-dirs.yaml | 12 ++++++------
tests/fetch-output.yaml | 12 ++++++------
tests/fetch-zuul-cloner.yaml | 10 +++++-----
tests/multi-node-bridge.yaml | 6 +++---
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/tests/configure-unbound.yaml b/tests/configure-unbound.yaml
index 0fdf6cad..d40315ea 100644
--- a/tests/configure-unbound.yaml
+++ b/tests/configure-unbound.yaml
@@ -13,7 +13,7 @@
- name: Ensure that unbound is started
assert:
that:
- - not unbound_service | changed
+ - unbound_service is not changed
# Until nodepool no longer embeds a forwarding.conf in the image, it is
# safe to assume that we'll be changing the forwarding configuration
@@ -22,8 +22,8 @@
- name: Ensure that configuration was installed
assert:
that:
- - forwarding_config | changed
- - ttl_config | changed
+ - forwarding_config is changed
+ - ttl_config is changed
- name: Check if /etc/unbound/forwarding.conf exists
stat:
diff --git a/tests/ensure-output-dirs.yaml b/tests/ensure-output-dirs.yaml
index 26ef6ed0..e0e37db3 100644
--- a/tests/ensure-output-dirs.yaml
+++ b/tests/ensure-output-dirs.yaml
@@ -24,9 +24,9 @@
- name: Validate that directories were set correctly
assert:
that:
- - not log_directory | changed
- - log_directory | succeeded
- - not artifact_directory | changed
- - artifact_directory | succeeded
- - not doc_directory | changed
- - doc_directory | succeeded
+ - log_directory is not changed
+ - log_directory is succeeded
+ - artifact_directory is not changed
+ - artifact_directory is succeeded
+ - doc_directory is not changed
+ - doc_directory is succeeded
diff --git a/tests/fetch-output.yaml b/tests/fetch-output.yaml
index 7a5cb3aa..36a9958a 100644
--- a/tests/fetch-output.yaml
+++ b/tests/fetch-output.yaml
@@ -38,9 +38,9 @@
- name: Validate that files were pulled correctly
assert:
that:
- - not local_log_content | changed
- - local_log_content | succeeded
- - not local_artifact_content | changed
- - local_artifact_content | succeeded
- - not local_doc_content | changed
- - local_doc_content | succeeded
+ - local_log_content is not changed
+ - local_log_content is succeeded
+ - local_artifact_content is not changed
+ - local_artifact_content is succeeded
+ - local_doc_content is not changed
+ - local_doc_content is succeeded
diff --git a/tests/fetch-zuul-cloner.yaml b/tests/fetch-zuul-cloner.yaml
index 70331fe1..2b40b85b 100644
--- a/tests/fetch-zuul-cloner.yaml
+++ b/tests/fetch-zuul-cloner.yaml
@@ -20,8 +20,8 @@
- name: Validate that the shim was installed successfully
assert:
that:
- - not directory | changed
- - directory | succeeded
+ - directory is not changed
+ - directory is succeeded
- cloner.stat.exists
- cloner.stat.mode == "0755"
@@ -77,8 +77,8 @@
- name: Validate zuul-cloner shim results
assert:
that:
- - clone_with_required | succeeded
- - clone_with_required | changed
+ - clone_with_required is succeeded
+ - clone_with_required is changed
- with_required_stat.stat.exists
- - clone_without_required | failed
+ - clone_without_required is failed
- not without_required_stat.stat.exists
diff --git a/tests/multi-node-bridge.yaml b/tests/multi-node-bridge.yaml
index d05d50f4..3d19c7a8 100644
--- a/tests/multi-node-bridge.yaml
+++ b/tests/multi-node-bridge.yaml
@@ -45,9 +45,9 @@
- name: assert test results
assert:
that:
- - not ovs_installed | changed
- - not ovs_running | changed
- - not ovs_bridge | changed
+ - ovs_installed is not changed
+ - ovs_running is not changed
+ - ovs_bridge is not changed
- ovs_port.rc == 0
- "'Port \"br-infra_' in ovs_port.stdout"
- ovs_ping_switch.rc == 0