[MERGE] More windows test fixes

John Arbash Meinel john at arbash-meinel.com
Thu Aug 14 17:40:58 BST 2008

John Arbash Meinel has voted tweak.
Status is now: Semi-approved
-        self.addCleanup(result_basis.unlock)
-        self.assertEqual(expected_inventory, result_basis.inventory)
+        try:
+            self.assertEqual(expected_inventory, 
+        finally:
+            result_basis.unlock()

^- Why is addCleanup not sufficient here?
I guess I'm concerned because we use addCleanup in a lot of places, so 
if it
isn't working, then we will have a lot of knock-on places to fix up. So 
certainly rather get addCleanup working.

-        real_os_link = os.link
+        try:
+            real_os_link = os.link
+        except AttributeError:
+            raise TestSkipped("This platform doesn't provide os.link")

^- I think this would be better as

real_os_link = getattr(os, 'link', None)
if real_os_link is None:
     raise TestNotApplicable('This platform does not provide os.link')

N/A because there isn't really a way for a user to provide the support.

I would also like to see us do it at the beginning of the test, so that 
don't spend the time to do commit, etc, just to abort the test.

The rest seems good.

For details, see: 
Project: Bazaar

More information about the bazaar mailing list