Merge pull request #63 from sophiegreen/master

Add IT for missing requests library

Author: stewartfrancis

build.sh

@@ -39,7 +39,10 @@ echo "/* -----------------------------------------------------------------------
 echo "/*               Integration tests for missing libraries Python 3.8           */"
 echo "/* -------------------------------------------------------------------------- */"
 (set -x; pip uninstall xmltodict -y)
-(set -x; ansible-test integration cics_cmci_missing_libraries --python 3.8)
+(set -x; ansible-test integration cics_cmci_missing_xmltodict_library --python 3.8)
+(set -x; pip install -r prod-requirements.txt)
+(set -x; pip uninstall requests -y)
+(set -x; ansible-test integration cics_cmci_missing_requests_library --python 3.8)
 (set -x; pip install -r prod-requirements.txt)
 
 echo $?

tests/integration/targets/cics_cmci_missing_requests_library/playbooks/cmci_missing_requests.yml

@@ -0,0 +1,35 @@
+# Copyright (c) IBM Corporation 2020
+# Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
+---
+- name:  CMCI Integration Test
+  collections:
+   - ibm.ibm_zos_cics
+  hosts: 'localhost'
+  gather_facts: 'false'
+
+  tasks:
+    - name: test missing requests library
+      ibm.ibm_zos_cics.cmci_get:
+        cmci_host: 'host'
+        cmci_port: '12345'
+        cmci_user: 'user'
+        cmci_password: 'validpassword'
+        insecure: true
+        context: 'content'
+        scope: 'scope'
+        type: 'cicsprogram'
+      failed_when: false
+      register: result
+
+    - name: debug
+      debug:
+        msg: '{{ result.msg }}'
+
+    - name: assert
+      assert:
+        that:
+          - result.failed is false
+          - '{{  result.msg[:59] == "Failed to import the required Python library (requests) on " }}'
+          - '{{  result.msg[-232:] == "Please read the module documentation and install it in the appropriate location.
+                  If the required library is installed, but Ansible is using the wrong Python interpreter, please
+                  consult the documentation on ansible_python_interpreter" }}'

tests/integration/targets/cics_cmci_missing_libraries/runme.sh renamed to tests/integration/targets/cics_cmci_missing_requests_library/runme.sh

@@ -2,4 +2,4 @@
 # Copyright (c) IBM Corporation 2020
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
 set -eux # This is important to ensure that return codes from failing tests are propagated
-ansible-playbook -e "@cmci-variables.yml" playbooks/cmci_missing_xmltodict.yml
+ansible-playbook playbooks/cmci_missing_requests.yml

tests/integration/targets/cics_cmci_missing_libraries/playbooks/cmci_missing_xmltodict.yml renamed to tests/integration/targets/cics_cmci_missing_xmltodict_library/playbooks/cmci_missing_xmltodict.yml

@@ -10,13 +10,13 @@
   tasks:
     - name: test missing xmltodict library
       ibm.ibm_zos_cics.cmci_get:
-        cmci_host: '{{ cmci_host }}'
-        cmci_port: '{{ cmci_port }}'
-        cmci_user: '{{ cmci_user }}'
-        cmci_password: '{{ cmci_password }}'
+        cmci_host: 'host'
+        cmci_port: '12345'
+        cmci_user: 'user'
+        cmci_password: 'validpassword'
         insecure: true
-        context: '{{ context }}'
-        scope: '{{ scope }}'
+        context: 'content'
+        scope: 'scope'
         type: 'cicsprogram'
       failed_when: false
       register: result

tests/integration/targets/cics_cmci_missing_xmltodict_library/runme.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Copyright (c) IBM Corporation 2020
+# Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
+set -eux # This is important to ensure that return codes from failing tests are propagated
+ansible-playbook playbooks/cmci_missing_xmltodict.yml