Allow multiple possibe error codes for the "status" parameter.

test/lib/TestCommon.py

 """
 TestCommon.py:  a testing framework for commands and scripts
                 with commonly useful error handling
 
 The TestCommon module provides a simple, high-level interface for writing
 tests of executable commands and scripts, especially commands and scripts
 that interact with the file system.  All methods throw exceptions and
 exit on failure, with useful error messages.  This makes a number of
 explicit checks unnecessary, making the test scripts themselves simpler
 to write and easier to read.
@@ skipping 171 matching lines @@
 def separate_files(flist):
     existing = []
     missing = []
     for f in flist:
         if os.path.exists(f):
             existing.append(f)
         else:
             missing.append(f)
     return existing, missing
 
-if os.name == 'posix':

[Nico, 2012/05/17 20:31:57]

The two branches looked identical to me, so I got rid of one.

-    def _failed(self, status = 0):
-        if self.status is None or status is None:
-            return None
-        return _status(self) != status
-    def _status(self):
-        return self.status
-elif os.name == 'nt':
-    def _failed(self, status = 0):
-        return not (self.status is None or status is None) and \
-               self.status != status
-    def _status(self):
-        return self.status
+def _failed(self, status = 0):
+    if self.status is None or status is None:
+        return None
+    try:
+      return _status(self) not in status

[Mark Mentovai, 2012/05/17 21:08:58]

OK to the reorganization, but could you be consistent with the indentation? You
used 2 here and for the next one, but 4 elsewhere.

[Nico, 2012/05/17 21:29:36]

Done. Huh, looks like this file doesn't use google style.

+    except TypeError:
+      # status wasn't an iterable
+      return _status(self) != status
+def _status(self):
+    return self.status
 
 class TestCommon(TestCmd):
 
     # Additional methods from the Perl Test::Cmd::Common module
     # that we may wish to add in the future:
     #
     #  $test->subdir('subdir', ...);
     #
     #  $test->copy('src_file', 'dst_file');
 
@@ skipping 357 matching lines @@
         else:
             # We're under the development directory for this change,
             # so this is an Aegis invocation; pass the test (exit 0).
             self.pass_test()
 
 # Local Variables:
 # tab-width:4
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=4 shiftwidth=4: