Correct some whitespace and line length, comments for sanity test ignore

stewartfrancis · stewartfrancis · commit abb5f49bed1f · 2021-02-09T10:26:31.000Z
Signed-off-by: Stew Francis &lt;stew@owww.org&gt;
diff --git a/plugins/doc_fragments/cmci.py b/plugins/doc_fragments/cmci.py
@@ -141,7 +141,7 @@ class ModuleDocFragment(object):
             C(and) and C(or) operators, see the C(complex_filter) parameter.
           - For examples, see M(cmci_get)
           - For more details, see L(How to build a filter expression,
-            https://www.ibm.com/support/knowledgecenter/SSGMCP_5.6.0/system-programming/cpsm/eyup1a0.html). 
+            https://www.ibm.com/support/knowledgecenter/SSGMCP_5.6.0/system-programming/cpsm/eyup1a0.html).
           - For supported attributes of different resource types, see their
             resource table reference, for example,
             L(PROGDEF resource table reference,
diff --git a/plugins/module_utils/cmci.py b/plugins/module_utils/cmci.py
@@ -102,7 +102,15 @@ def _cf_options(children):
 
 
 def _complex_filter():
-    children = _cf_child(_cf_options(_cf_options(_cf_options(ATTRIBUTE_ARGUMENTS))))
+    children = _cf_child(
+        _cf_options(
+            _cf_options(
+                _cf_options(
+                    ATTRIBUTE_ARGUMENTS
+                )
+            )
+        )
+    )
     base_type = {'type': 'dict'}
     # This warning is a PyCharm bug:
     # https://youtrack.jetbrains.com/issue/PY-43664
diff --git a/plugins/modules/cmci_action.py b/plugins/modules/cmci_action.py
@@ -54,7 +54,7 @@
         required: true
         type: str
       value:
-        description: > 
+        description: >
           Parameter value if any. Can be omitted if the parameter requires no
           value to be supplied, as shown in the resource table reference. For
           example, the OVERRIDE parameter for the PROGDEF INSTALL action doesn't
diff --git a/plugins/modules/cmci_get.py b/plugins/modules/cmci_get.py
@@ -85,7 +85,7 @@
         - name: csdgroup
           value: MYGRP
     record_count: 1
-    
+
 - name: Using complex_filter to combine filter expressions and change operators
   cmci_get:
     cmci_host: 'winmvs2c.hursley.ibm.com'
diff --git a/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_host.yml b/tests/integration/targets/cics_cmci/playbooks/cmci_incorrect_host.yml
@@ -30,4 +30,4 @@
         that:
           - result.failed is false
           - '{{  result.msg[:76] == "Error performing CMCI request: <urllib3.connection.HTTPSConnection object at" }}'
-          - '{{  result.msg[-92:] == "Failed to establish a new connection: [Errno 8] nodename nor servname provided, or not known"}}'
+          - '{{  result.msg[-92:] == "Failed to establish a new connection: [Errno 8] nodename nor servname provided, or not known" }}'
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
@@ -1,43 +1,38 @@
-docs/make.bat line-endings!skip
-plugins/modules/cmci_get.py validate-modules:missing-gplv3-license
-plugins/modules/cmci_get.py validate-modules:invalid-documentation
-plugins/modules/cmci_get.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/cmci_get.py validate-modules:doc-default-does-not-match-spec
-plugins/modules/cmci_get.py validate-modules:missing-suboption-docs
-plugins/modules/cmci_get.py validate-modules:parameter-type-not-in-doc
-plugins/modules/cmci_get.py validate-modules:undocumented-parameter
-plugins/modules/cmci_get.py validate-modules:doc-elements-mismatch
-plugins/modules/cmci_get.py validate-modules:mutually_exclusive-unknown
-plugins/modules/cmci_get.py validate-modules:required_one_of-unknown
-plugins/modules/cmci_action.py validate-modules:missing-gplv3-license
-plugins/modules/cmci_action.py validate-modules:invalid-documentation
-plugins/modules/cmci_action.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/cmci_action.py validate-modules:doc-default-does-not-match-spec
-plugins/modules/cmci_action.py validate-modules:missing-suboption-docs
-plugins/modules/cmci_action.py validate-modules:parameter-type-not-in-doc
-plugins/modules/cmci_action.py validate-modules:undocumented-parameter
-plugins/modules/cmci_action.py validate-modules:doc-elements-mismatch
-plugins/modules/cmci_action.py validate-modules:mutually_exclusive-unknown
-plugins/modules/cmci_action.py validate-modules:required_one_of-unknown
-plugins/modules/cmci_create.py validate-modules:missing-gplv3-license
-plugins/modules/cmci_create.py validate-modules:invalid-documentation
-plugins/modules/cmci_delete.py validate-modules:missing-gplv3-license
-plugins/modules/cmci_delete.py validate-modules:invalid-documentation
-plugins/modules/cmci_delete.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/cmci_delete.py validate-modules:doc-default-does-not-match-spec
-plugins/modules/cmci_delete.py validate-modules:missing-suboption-docs
-plugins/modules/cmci_delete.py validate-modules:parameter-type-not-in-doc
-plugins/modules/cmci_delete.py validate-modules:undocumented-parameter
-plugins/modules/cmci_delete.py validate-modules:doc-elements-mismatch
-plugins/modules/cmci_delete.py validate-modules:mutually_exclusive-unknown
-plugins/modules/cmci_delete.py validate-modules:required_one_of-unknown
-plugins/modules/cmci_update.py validate-modules:missing-gplv3-license
-plugins/modules/cmci_update.py validate-modules:invalid-documentation
-plugins/modules/cmci_update.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/cmci_update.py validate-modules:doc-default-does-not-match-spec
-plugins/modules/cmci_update.py validate-modules:missing-suboption-docs
-plugins/modules/cmci_update.py validate-modules:parameter-type-not-in-doc
-plugins/modules/cmci_update.py validate-modules:undocumented-parameter
-plugins/modules/cmci_update.py validate-modules:doc-elements-mismatch
-plugins/modules/cmci_update.py validate-modules:mutually_exclusive-unknown
-plugins/modules/cmci_update.py validate-modules:required_one_of-unknown
+docs/make.bat line-endings!skip # Windows batch file requires windows line endings
+plugins/modules/cmci_get.py validate-modules:missing-gplv3-license # Licence is Apache-2.0
+plugins/modules/cmci_get.py validate-modules:doc-choices-do-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_get.py validate-modules:doc-default-does-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_get.py validate-modules:missing-suboption-docs # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_get.py validate-modules:parameter-type-not-in-doc # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_get.py validate-modules:undocumented-parameter # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_get.py validate-modules:doc-elements-mismatch # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_get.py validate-modules:mutually_exclusive-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_get.py validate-modules:required_one_of-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:missing-gplv3-license # Licence is Apache-2.0
+plugins/modules/cmci_action.py validate-modules:doc-choices-do-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:doc-default-does-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:missing-suboption-docs # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:parameter-type-not-in-doc # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:undocumented-parameter # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:doc-elements-mismatch # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:mutually_exclusive-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_action.py validate-modules:required_one_of-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_create.py validate-modules:missing-gplv3-license # Licence is Apache-2.0
+plugins/modules/cmci_delete.py validate-modules:missing-gplv3-license # Licence is Apache-2.0
+plugins/modules/cmci_delete.py validate-modules:doc-choices-do-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_delete.py validate-modules:doc-default-does-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_delete.py validate-modules:missing-suboption-docs # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_delete.py validate-modules:parameter-type-not-in-doc # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_delete.py validate-modules:undocumented-parameter # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_delete.py validate-modules:doc-elements-mismatch # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_delete.py validate-modules:mutually_exclusive-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_delete.py validate-modules:required_one_of-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:missing-gplv3-license # Licence is Apache-2.0
+plugins/modules/cmci_update.py validate-modules:doc-choices-do-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:doc-default-does-not-match-spec # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:missing-suboption-docs # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:parameter-type-not-in-doc # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:undocumented-parameter # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:doc-elements-mismatch # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:mutually_exclusive-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
+plugins/modules/cmci_update.py validate-modules:required_one_of-unknown # We have a complex_filter DSL as part of our plugin YAML.  The same config is accepted 4 levels deep.  We only include the (quite long) documentation for this at the highest level, which causes this error
diff --git a/tests/unit/helpers/cmci_helper.py b/tests/unit/helpers/cmci_helper.py
@@ -219,7 +219,6 @@ def create_feedback_response(errors):  # type: (str, List) -> OrderedDict
     )
 
 
-
 def create_cmci_response(*args):  # type () -> OrderedDict
     return od(
         ('response', od(
diff --git a/tests/unit/modules/test_cmci_get.py b/tests/unit/modules/test_cmci_get.py
@@ -62,7 +62,7 @@ def test_401_fails(cmci_module):  # type: (CMCITestHelper) -> None
 
 def test_invalid_host(cmci_module):  # type: (CMCITestHelper) -> None
     cmci_module.expect({
-        'msg': 'Parameter "cmci_host" with value "^*.99.99.199" was not valid.  Expected an IP address or host name.',
+        'msg': 'Parameter "cmci_host" with value "^*.99.99.199" was not valid. Expected an IP address or host name.',
         'changed': False,
         'failed': True
     })
@@ -171,8 +171,8 @@ def test_invalid_port_high(cmci_module):  # type: (CMCITestHelper) -> None
 
 def test_invalid_context(cmci_module):  # type: (CMCITestHelper) -> None
     cmci_module.expect({
-        'msg': 'Parameter "context" with value "^&iyk3z0r9" was not valid.  Expected a CPSM context name.  CPSM '
-               'context names are max 8 characters.  Valid characters are A-Z a-z 0-9.',
+        'msg': 'Parameter "context" with value "^&iyk3z0r9" was not valid. Expected a CPSM context name.  CPSM '
+               'context names are max 8 characters. Valid characters are A-Z a-z 0-9.',
         'changed': False,
         'failed': True
     })
@@ -188,8 +188,8 @@ def test_invalid_context(cmci_module):  # type: (CMCITestHelper) -> None
 
 def test_invalid_scope(cmci_module):  # type: (CMCITestHelper) -> None
     cmci_module.expect({
-        'msg': 'Parameter "scope" with value "&^iyk3z0r8" was not valid.  Expected a CPSM scope name.  CPSM scope '
-               'names are max 8 characters.  Valid characters are A-Z a-z 0-9.',
+        'msg': 'Parameter "scope" with value "&^iyk3z0r8" was not valid. Expected a CPSM scope name. CPSM scope '
+               'names are max 8 characters. Valid characters are A-Z a-z 0-9.',
         'changed': False,
         'failed': True
     })

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,6 @@ def create_feedback_response(errors): # type: (str, List) -> OrderedDict`
`219`	`219`	`)`
`220`	`220`
`221`	`221`
`222`		`-`
`223`	`222`	`def create_cmci_response(*args): # type () -> OrderedDict`
`224`	`223`	`return od(`
`225`	`224`	`('response', od(`