added ability to silence all output -- closes #11

fencepy/main.py

@@ -57,6 +57,8 @@ def _get_args():
                       help='Print debug logging')
     misc.add_argument('-q', '--quiet', action='store_true',
                       help='Silence all console output')
+    misc.add_argument('-s', '--silent', action='store_true',
+                      help='Silence ALL output, including log output')
     misc.add_argument("-h", "--help", action="help",
                       help="Show this help message and exit")
 
@@ -69,11 +71,12 @@ def _get_args():
         os.mkdir(args['fencepy_root'])
 
     # set up logging
-    f = l.Formatter('%(asctime)s [%(levelname)s] %(module)s: %(message)s')
-    h = RotatingFileHandler(os.path.join(args['fencepy_root'], 'fencepy.log'))
-    h.setFormatter(f)
-    l.getLogger('').addHandler(h)
-    if not args['quiet']:
+    if not args['silent']:
+        f = l.Formatter('%(asctime)s [%(levelname)s] %(module)s: %(message)s')
+        h = RotatingFileHandler(os.path.join(args['fencepy_root'], 'fencepy.log'))
+        h.setFormatter(f)
+        l.getLogger('').addHandler(h)
+    if not (args['silent'] or args['quiet']):
         f = l.Formatter('[%(levelname)s] %(message)s')
         h = l.StreamHandler()
         h.setFormatter(f)

tests/test_fencepy.py

@@ -22,14 +22,16 @@ class TestFencepy(TestCase):
 
     def _fence(self, *args):
         # always include the overridden fencepy directory
-        sys.argv = ['fencepy', '-F', self.fdir] + list(args)
+        # no logging, since that breaks tests in Windows (with overridden fencepy dir)
+        sys.argv = ['fencepy', '-F', self.fdir, '-s'] + list(args)
         ret = fencepy.fence()
         sys.argv = ORIGINAL_ARGV
         return ret
 
     def _get_arg_dict(self, *args):
         # always include the overridden fencepy directory
-        sys.argv = ['fencepy', '-F', self.fdir, '-q'] + list(args)
+        # no logging, since that breaks tests in Windows (with overridden fencepy dir)
+        sys.argv = ['fencepy', '-F', self.fdir, '-s'] + list(args)
         ret = fencepy.main._get_args()
         sys.argv = ORIGINAL_ARGV
         return ret