Changeset 1514 in tailor

Timestamp:

05/20/08 17:17:56 (5 years ago)

Author:

lele@…

Hash name:

20080520151756-97f81-8984c9abe378971ad6190b805e7fd3f86dac7d27

Message:

Allow to override what SystemCommand? assume as an ok status

Location:

vcpx

Files:

• shwrap.py (modified) (3 diffs)
• tests/shwrap.py (modified) (1 diff)

vcpx/shwrap.py

@@ -53 +53 @@
     """Don't execute commands longer than this number of characters."""
 
-    def __init__(self, command=None, cwd=None, nolog=False):
+    def __init__(self, command=None, cwd=None, nolog=False, ok_status=None):
         """
         Initialize a ExternalCommand instance, specifying the command
@@ -71 +71 @@
         self.exit_status = None
         """Once the command has been executed, this is its exit status."""
+
+        self.ok_status = ok_status is None and (0,) or ok_status
+        """Used to determine which exit_status should not trigger warnings."""
 
         self._last_command = None
@@ -267 +270 @@
 
         self.exit_status = process.returncode
-        if not self.exit_status:
+        if self.exit_status in self.ok_status:
             if self.log: self.log.info("[Ok]")
         else:

vcpx/tests/shwrap.py

@@ -36 +36 @@
         c.execute()
         self.assertNotEqual(c.exit_status, 0)
+
+    def testOkStatus(self):
+        """Verify the log on exit_status"""
+
+        class Logger:
+            def warning(self, *args):
+                raise Exception('should not happen: %s' % str(args))
+
+            def info(self, *args):
+                pass
+
+            def debug(self, *args):
+                pass
+
+        if platform != 'win32':
+            c = ExternalCommand(['false'], ok_status=(0,1))
+        else:
+            c = ExternalCommand(['cmd','/c exit 1'], ok_status=(0,1))
+        c.execute()
+
+        c.log = Logger()
+        c.execute()
 
     def testExitStatusUnknownCommand(self):