Rev 4800: Merge the assertFilenameSkipped test skipping. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite

------------------------------------------------------------
revno: 4800 [merge]
revision-id: john at arbash-meinel.com-20091108045217-iz90ih2h760an33s
parent: john at arbash-meinel.com-20091108044423-es6gnn7wjh2aekfe
parent: john at arbash-meinel.com-20091108044906-cjihus7io3kbtjhb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-test-suite
timestamp: Sat 2009-11-07 22:52:17 -0600
message:
  Merge the assertFilenameSkipped test skipping.
modified:
  bzrlib/tests/per_workingtree/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
-------------- next part --------------
=== modified file 'bzrlib/tests/per_workingtree/test_smart_add.py'
--- a/bzrlib/tests/per_workingtree/test_smart_add.py	2009-09-28 02:02:30 +0000
+++ b/bzrlib/tests/per_workingtree/test_smart_add.py	2009-11-08 04:49:06 +0000
@@ -17,6 +17,7 @@
 """Test that we can use smart_add on all Tree implementations."""
 
 from cStringIO import StringIO
+import sys
 
 from bzrlib import (
     add,
@@ -53,7 +54,12 @@
 
     def assertFilenameSkipped(self, filename):
         tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/'+filename])
+        try:
+            self.build_tree(['tree/'+filename])
+        except errors.NoSuchFile:
+            if sys.platform == 'win32':
+                raise tests.TestNotApplicable('Cannot create files named %r on'
+                    ' win32' % (filename,))
         tree.smart_add(['tree'])
         self.assertEqual(None, tree.path2id(filename))