Fix test_run_action output check

Author: cderici

tests/integration/test_unit.py

@@ -116,6 +116,21 @@ async def run_action(unit):
         # wait for the action to complete
         return await action.wait()
 
+    def check_results(results, out):
+        assert 'dir' in results
+        assert 'stdout' in results or 'Stdout' in results
+        assert 'Code' in results or 'return-code' in results
+        if 'Code' in results:
+            assert results['Code'] == 0
+        else:
+            assert results['return-code'] == 0
+
+        if 'stdout' in results:
+            assert results['stdout'] == out
+        else:
+            assert results['Stdout'] == out
+        assert results['dir'] == '/var/git/myrepo.git'
+
     async with base.CleanModel() as model:
         app = await model.deploy(
             'git',
@@ -126,23 +141,13 @@ async def run_action(unit):
 
         for unit in app.units:
             action = await run_action(unit)
-            assert action.results == {
-                'Code': '0',
-                'Stdout': "Adding group `myrepo' (GID 1001) ...\n"
-                          'Done.\n'
-                          'Initialized empty Git repository in '
-                          '/var/git/myrepo.git/\n',
-                'dir': '/var/git/myrepo.git',
-            }
-            out = await model.get_action_output(action.entity_id, wait=5)
-            assert out == {
-                'Code': '0',
-                'Stdout': "Adding group `myrepo' (GID 1001) ...\n"
-                          'Done.\n'
-                          'Initialized empty Git repository in '
-                          '/var/git/myrepo.git/\n',
-                'dir': '/var/git/myrepo.git',
-            }
+            out = "Adding group `myrepo' (GID 1001) ...\n" \
+                  'Done.\n' \
+                  'Initialized empty Git repository in ' \
+                  '/var/git/myrepo.git/\n'
+            check_results(action.results, out)
+            output = await model.get_action_output(action.entity_id, wait=5)
+            check_results(output, out)
             status = await model.get_action_status(
                 uuid_or_prefix=action.entity_id)
             assert status[action.entity_id] == 'completed'