Merge branch 'develop' of github.com:saltstack/salt into develop

salt/state.py

@@ -361,7 +361,7 @@ class State(object):
                 errors.append(err)
             if not isinstance(body, dict):
                 err = ('The type {0} in {1} is not formated as a dictionary'
-                       .format(name, body['__sls__']))
+                       .format(name, body))
                 errors.append(err)
                 continue
             for state in body:

tests/runtests.py

@@ -201,7 +201,7 @@ def parse_opts():
             format="[%(levelname)-8s][%(name)-10s:%(lineno)-4d] %(message)s"
         )
     else:
-        logging.basicConfig(stream=open(os.devnull, 'w'))
+        logging.basicConfig(stream=open(os.devnull, 'w'), level=0)
 
     if not any((options.module, options.client,
                 options.shell, options.unit,

tests/unit/utils/verify_test.py

@@ -114,15 +114,17 @@ class TestVerify(TestCase):
                     }
 
                     check_max_open_files(opts)
-                    self.assertIn(logmsg_dbg.format(newmax), handler.messages)
+
                     if level is None:
                         # No log message is triggered, only the DEBUG one which
                         # tells us how many minion keys were accepted.
                         self.assertEqual(
-                            [logmsg_dbg.format(newmax)],
-                            handler.messages
+                            [logmsg_dbg.format(newmax)], handler.messages
                         )
                     else:
+                        self.assertIn(
+                            logmsg_dbg.format(newmax), handler.messages
+                        )
                         self.assertIn(
                             logmsg_chk.format(
                                 level,