Merge branch 'bugfix/log-extra-colon' into dev

sirosen · Jul 26, 2014 · 42a8a9a · 42a8a9a
2 parents 1be3cba + 4882147
commit 42a8a9a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/salve/util/log.py b/salve/util/log.py
@@ -89,11 +89,11 @@ def log(self, log_type, message, file_context=None,
         # if hide_context is false, prepend it to the message with
         # a colon separator. Otherwise, it will be omitted
         if not hide_context:
-            ctx_prefix = '[' + str(ectx) + ']'
+            ctx_prefix = '[' + str(ectx) + '] '
             if file_context is not None:
-                ctx_prefix += ' ' + str(file_context)
+                ctx_prefix += str(file_context) + ': '
 
-            message = ctx_prefix + ': ' + message
+            message = ctx_prefix + message
 
         # construct message prefix
         ty_prefix = '[' + log_type + ']'

diff --git a/tests/unit/execute/modify_test.py b/tests/unit/execute/modify_test.py
@@ -188,7 +188,7 @@ def mock_chmod(f, mode):
 
         assert log['chmod'] is None
         assert (self.stderr.getvalue() ==
-            ('[WARN] [VERIFICATION]: ' +
+            ('[WARN] [VERIFICATION] ' +
              'FileChmod: Unowned target file "a"\n')), self.stderr.getvalue()
 
     @istest
@@ -214,7 +214,7 @@ def mock_lchown(f_or_d, uid, gid):
             act()
 
         assert len(lchown_args) == 0
-        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION]: ' +
+        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION] ' +
             'DirChown: Cannot Chown as Non-Root User\n')), \
             self.stderr.getvalue()
 
@@ -241,7 +241,7 @@ def mock_chmod(f_or_d, mode):
             act()
 
         assert len(chmod_args) == 0
-        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION]: ' +
+        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION] ' +
              'DirChmod: Unowned target dir "a"\n')), self.stderr.getvalue()
 
     @istest
@@ -266,7 +266,7 @@ def mock_lchown(f_or_d, uid, gid):
             act()
 
         assert len(lchown_args) == 0
-        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION]: ' +
+        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION] ' +
             'DirChown: Cannot Chown as Non-Root User\n')), \
             self.stderr.getvalue()
 
@@ -295,7 +295,7 @@ def mock_chmod(f_or_d, mode):
             act()
 
         assert len(chmod_args) == 0
-        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION]: ' +
+        assert (self.stderr.getvalue() == ('[WARN] [EXECUTION] ' +
              'DirChmod: Unowned target dir "a"\n')), self.stderr.getvalue()
 
     @istest