Rev 4735: Fix a test that depended on but didn't 'require' meliae in http://bazaar.launchpad.net/~jameinel/bzr/2.1-static-tuple

John Arbash Meinel john at arbash-meinel.com
Fri Oct 2 05:20:39 BST 2009


At http://bazaar.launchpad.net/~jameinel/bzr/2.1-static-tuple

------------------------------------------------------------
revno: 4735
revision-id: john at arbash-meinel.com-20091002042030-65rlathg6cere9a4
parent: john at arbash-meinel.com-20091002022112-w4ispnaes2t78pty
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-static-tuple
timestamp: Thu 2009-10-01 23:20:30 -0500
message:
  Fix a test that depended on but didn't 'require' meliae
-------------- next part --------------
=== modified file 'bzrlib/tests/test__static_tuple.py'
--- a/bzrlib/tests/test__static_tuple.py	2009-10-01 19:06:35 +0000
+++ b/bzrlib/tests/test__static_tuple.py	2009-10-02 04:20:30 +0000
@@ -286,9 +286,10 @@
         self.requireFeature(Meliae)
 
     def test_empty_is_singleton(self):
+        self.requireFeature(Meliae)
+        from meliae import scanner
         key = self.module.StaticTuple()
         self.assertIs(key, self.module._empty_tuple)
-        from meliae import scanner
         strs = ['foo', 'bar', 'baz', 'bing']
         k1 = self.module.StaticTuple(*strs[:2])
         k2 = self.module.StaticTuple(*strs[2:])



More information about the bazaar-commits mailing list