Rev 4722: Update 2 tests to pass on Windows, already fixed in .dev in http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-change-root-id-494269

John Arbash Meinel john at arbash-meinel.com
Mon Jan 11 22:11:29 GMT 2010


At http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-change-root-id-494269

------------------------------------------------------------
revno: 4722
revision-id: john at arbash-meinel.com-20100111221113-whijbohor3rmujyi
parent: pqm at pqm.ubuntu.com-20100108010840-tywncpw4p715pwu4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.4-change-root-id-494269
timestamp: Mon 2010-01-11 16:11:13 -0600
message:
  Update 2 tests to pass on Windows, already fixed in .dev
-------------- next part --------------
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2009-10-14 18:37:13 +0000
+++ b/bzrlib/tests/test_transform.py	2010-01-11 22:11:13 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -2428,7 +2428,7 @@
 
     def test_file_content_summary_executable(self):
         if not osutils.supports_executable():
-            raise TestNotApplicable()
+            raise tests.TestNotApplicable()
         preview = self.get_empty_preview()
         path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
         preview.set_executability(True, path_id)
@@ -2443,8 +2443,6 @@
         self.assertIs(None, summary[3])
 
     def test_change_executability(self):
-        if not osutils.supports_executable():
-            raise TestNotApplicable()
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/path'])
         tree.add('path')



More information about the bazaar-commits mailing list