From 1746d11749e88ce8c7f809e0c41e7d06c6350375 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Fri, 16 Jul 2021 20:06:35 +0200
Subject: [PATCH] Enable tests (#3015) (#3018)

* Enable tests.

* Fix error message check.

* Fix boolean tests.

* Adjust to Python version.

(cherry picked from commit 9b1c6f0743f87264ce658b5d548e358dfe9af740)

Co-authored-by: Felix Fontein <felix@fontein.de>
---
 tests/integration/targets/filter_groupby/aliases       |  2 +-
 .../integration/targets/filter_groupby/tasks/main.yml  |  2 +-
 tests/integration/targets/module_helper/aliases        |  2 +-
 .../targets/module_helper/tasks/mdepfail.yml           |  4 ++--
 .../targets/module_helper/tasks/msimple.yml            | 10 +++++-----
 .../integration/targets/module_helper/tasks/mstate.yml | 10 +++++-----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/integration/targets/filter_groupby/aliases b/tests/integration/targets/filter_groupby/aliases
index 6e79abdd02..3e81d77f98 100644
--- a/tests/integration/targets/filter_groupby/aliases
+++ b/tests/integration/targets/filter_groupby/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group4
+shippable/posix/group3
 skip/python2.6  # filters are controller only, and we no longer support Python 2.6 on the controller
diff --git a/tests/integration/targets/filter_groupby/tasks/main.yml b/tests/integration/targets/filter_groupby/tasks/main.yml
index 29036a3bc5..219e047d4d 100644
--- a/tests/integration/targets/filter_groupby/tasks/main.yml
+++ b/tests/integration/targets/filter_groupby/tasks/main.yml
@@ -42,4 +42,4 @@
 
 - assert:
     that:
-      - result.msg == "Multiple sequence entries have attribute value 'a'"
+      - result.msg == "Multiple sequence entries have attribute value 'a'" or result.msg == "Multiple sequence entries have attribute value u'a'"
diff --git a/tests/integration/targets/module_helper/aliases b/tests/integration/targets/module_helper/aliases
index 3005e4b26d..765b70da79 100644
--- a/tests/integration/targets/module_helper/aliases
+++ b/tests/integration/targets/module_helper/aliases
@@ -1 +1 @@
-shippable/posix/group4
+shippable/posix/group2
diff --git a/tests/integration/targets/module_helper/tasks/mdepfail.yml b/tests/integration/targets/module_helper/tasks/mdepfail.yml
index ad8fc5d57d..01523513a3 100644
--- a/tests/integration/targets/module_helper/tasks/mdepfail.yml
+++ b/tests/integration/targets/module_helper/tasks/mdepfail.yml
@@ -10,8 +10,8 @@
 - name: assert failing dependency
   assert:
     that:
-      - result.failed is true
+      - result is failed
       - '"Failed to import" in result.msg'
       - '"nopackagewiththisname" in result.msg'
-      - '"ModuleNotFoundError:" in result.exception'
+      - '"ModuleNotFoundError:" in result.exception or "ImportError:" in result.exception'
       - '"nopackagewiththisname" in result.exception'
diff --git a/tests/integration/targets/module_helper/tasks/msimple.yml b/tests/integration/targets/module_helper/tasks/msimple.yml
index 4f032fd177..4d2ff9b798 100644
--- a/tests/integration/targets/module_helper/tasks/msimple.yml
+++ b/tests/integration/targets/module_helper/tasks/msimple.yml
@@ -11,7 +11,7 @@
     that:
       - simple1.a == 80
       - simple1.abc == "abc"
-      - simple1.changed is false
+      - simple1 is not changed
       - simple1.value is none
 
 - name: test msimple 2
@@ -26,8 +26,8 @@
       - simple2.a == 101
       - 'simple2.msg == "Module failed with exception: a >= 100"'
       - simple2.abc == "abc"
-      - simple2.failed is true
-      - simple2.changed is false
+      - simple2 is failed
+      - simple2 is not changed
       - simple2.value is none
 
 - name: test msimple 3
@@ -42,7 +42,7 @@
       - simple3.a == 2
       - simple3.b == "potatoespotatoes"
       - simple3.c == "NoneNone"
-      - simple3.changed is false
+      - simple3 is not changed
 
 - name: test msimple 4
   msimple:
@@ -54,4 +54,4 @@
     that:
       - simple4.c == "abc change"
       - simple4.abc == "changed abc"
-      - simple4.changed is true
+      - simple4 is changed
diff --git a/tests/integration/targets/module_helper/tasks/mstate.yml b/tests/integration/targets/module_helper/tasks/mstate.yml
index c4dfdb9a0e..6476f76429 100644
--- a/tests/integration/targets/module_helper/tasks/mstate.yml
+++ b/tests/integration/targets/module_helper/tasks/mstate.yml
@@ -16,7 +16,7 @@
       - state1.b == "banana"
       - state1.c == "cashew"
       - state1.result == "abc"
-      - state1.changed is false
+      - state1 is not changed
 
 - name: test mstate 2
   mstate:
@@ -32,7 +32,7 @@
       - state2.b == "banana"
       - state2.c == "cashew"
       - state2.result == "80bananacashew"
-      - state2.changed is true
+      - state2 is changed
 
 - name: test mstate 3
   mstate:
@@ -47,7 +47,7 @@
       - state3.a == 3
       - state3.b == "banana"
       - state3.result == "bananabananabanana"
-      - state3.changed is true
+      - state3 is changed
 
 - name: test mstate 4
   mstate:
@@ -62,7 +62,7 @@
       - state4.a == 4
       - state4.c == "cashew"
       - state4.result == "cashewcashewcashewcashew"
-      - state4.changed is true
+      - state4 is changed
 
 - name: test mstate 5
   mstate:
@@ -79,4 +79,4 @@
       - state5.b == "foo"
       - state5.c == "bar"
       - state5.result == "foobarfoobarfoobarfoobarfoobar"
-      - state5.changed is true
+      - state5 is changed