Package: bzr
Version: 0.11-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my bzr 0.11-1.1 NMU.
--
Homepage: http://www.sesse.net/
diff -Nru /tmp/Bkhw0GEYfT/bzr-0.11/bzrlib/tests/test_osutils.py
/tmp/wOiYmYDAJb/bzr-0.11/bzrlib/tests/test_osutils.py
--- /tmp/Bkhw0GEYfT/bzr-0.11/bzrlib/tests/test_osutils.py 2006-10-02
01:39:28.000000000 +0200
+++ /tmp/wOiYmYDAJb/bzr-0.11/bzrlib/tests/test_osutils.py 2006-11-08
01:58:38.000000000 +0100
@@ -444,14 +444,14 @@
def test_copy_basic_tree(self):
self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c'])
osutils.copy_tree('source', 'target')
- self.assertEqual(['a', 'b'], os.listdir('target'))
+ self.assertEqual(['a', 'b'], sorted(os.listdir('target')))
self.assertEqual(['c'], os.listdir('target/b'))
def test_copy_tree_target_exists(self):
self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c',
'target/'])
osutils.copy_tree('source', 'target')
- self.assertEqual(['a', 'b'], os.listdir('target'))
+ self.assertEqual(['a', 'b'], sorted(os.listdir('target')))
self.assertEqual(['c'], os.listdir('target/b'))
def test_copy_tree_symlinks(self):
diff -Nru /tmp/Bkhw0GEYfT/bzr-0.11/debian/changelog
/tmp/wOiYmYDAJb/bzr-0.11/debian/changelog
--- /tmp/Bkhw0GEYfT/bzr-0.11/debian/changelog 2006-11-08 01:58:35.000000000
+0100
+++ /tmp/wOiYmYDAJb/bzr-0.11/debian/changelog 2006-11-08 01:58:38.000000000
+0100
@@ -1,3 +1,13 @@
+bzr (0.11-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * In test_osutils.py, sort what we get from os.listdir() before checking it;
+ the OS can give back directory entries in whatever order it likes, and
+ this shouldn't break the tests. Fixes intermittent test failures and
+ FTBFS. (Closes: #395203)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Wed, 8 Nov 2006 01:28:55 +0100
+
bzr (0.11-1) unstable; urgency=low
* New upstream release (closes: #389606).
