indent quoted code in cmdmod tests

tests/integration/modules/state.py

@@ -3,6 +3,7 @@
 # Import python libs
 import os
 import shutil
+import textwrap
 
 # Import Salt Testing libs
 from salttesting import skipIf
@@ -18,7 +19,7 @@ from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 class StateModuleTest(integration.ModuleCase,
                       integration.SaltReturnAssertsMixIn):
     '''
-    Validate the test module
+    Validate the state module
     '''
 
     maxDiff = None
@@ -79,17 +80,17 @@ class StateModuleTest(integration.ModuleCase,
         ret = self.run_function('state.sls', mods='testappend.step-2')
         self.assertSaltTrueReturn(ret)
 
-        self.assertMultiLineEqual('''\
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
+        self.assertMultiLineEqual(textwrap.dedent('''\
+            # set variable identifying the chroot you work in (used in the prompt below)
+            if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+                debian_chroot=$(cat /etc/debian_chroot)
+            fi
 
-# enable bash completion in interactive shells
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi
-''', salt.utils.fopen(testfile, 'r').read())
+            # enable bash completion in interactive shells
+            if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+                . /etc/bash_completion
+            fi
+            '''), salt.utils.fopen(testfile, 'r').read())
 
         # Re-append switching order
         ret = self.run_function('state.sls', mods='testappend.step-2')
@@ -98,17 +99,17 @@ fi
         ret = self.run_function('state.sls', mods='testappend.step-1')
         self.assertSaltTrueReturn(ret)
 
-        self.assertMultiLineEqual('''\
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
+        self.assertMultiLineEqual(textwrap.dedent('''\
+            # set variable identifying the chroot you work in (used in the prompt below)
+            if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+                debian_chroot=$(cat /etc/debian_chroot)
+            fi
 
-# enable bash completion in interactive shells
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi
-''', salt.utils.fopen(testfile, 'r').read())
+            # enable bash completion in interactive shells
+            if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+                . /etc/bash_completion
+            fi
+            '''), salt.utils.fopen(testfile, 'r').read())
 
     def test_issue_1876_syntax_error(self):
         '''
@@ -133,16 +134,16 @@ fi
         )
 
     def test_issue_1879_too_simple_contains_check(self):
-        contents = '''\
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-# enable bash completion in interactive shells
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi
-'''
+        contents = textwrap.dedent('''\
+            # set variable identifying the chroot you work in (used in the prompt below)
+            if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+                debian_chroot=$(cat /etc/debian_chroot)
+            fi
+            # enable bash completion in interactive shells
+            if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+                . /etc/bash_completion
+            fi
+            ''')
         testfile = os.path.join(integration.TMP, 'issue-1879')
         # Delete if exiting
         if os.path.isfile(testfile):
@@ -321,15 +322,15 @@ fi
                 shutil.rmtree(venv_dir)
 
     def test_template_invalid_items(self):
-        TEMPLATE = '''\
-{0}:
-  - issue-2068-template-str
+        TEMPLATE = textwrap.dedent('''\
+            {0}:
+              - issue-2068-template-str
 
-/tmp/test-template-invalid-items:
-  file:
-    - managed
-    - source: salt://testfile
-'''
+            /tmp/test-template-invalid-items:
+              file:
+                - managed
+                - source: salt://testfile
+            ''')
         for item in ('include', 'exclude', 'extends'):
             ret = self.run_function(
                 'state.template_str', [TEMPLATE.format(item)]