Rev 2468: Clean up the (failing) test so that the last thing in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/iter_changes_ignores_unknowns

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/iter_changes_ignores_unknowns

------------------------------------------------------------
revno: 2468
revision-id: john at arbash-meinel.com-20070426225601-ae4qfcb8bzcfomny
parent: john at arbash-meinel.com-20070426224632-6nrmxl1kfbji3c63
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_ignores_unknowns
timestamp: Thu 2007-04-26 17:56:01 -0500
message:
  Clean up the (failing) test so that the last thing
  to fail is what I'm fixing.
modified:
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
-------------- next part --------------
=== modified file 'bzrlib/tests/test_workingtree_4.py'
--- a/bzrlib/tests/test_workingtree_4.py	2007-04-26 22:46:32 +0000
+++ b/bzrlib/tests/test_workingtree_4.py	2007-04-26 22:56:01 +0000
@@ -563,9 +563,14 @@
         self.addCleanup(tree.unlock)
         basis.lock_read()
         self.addCleanup(basis.unlock)
-        self.assertEqual([], list(tree._iter_changes(basis)))
-        self.assertEqual(['', 'versioned', 'versioned2'], returned)
-        self.assertEqual([], list(tree._iter_changes(basis,
-                                            want_unversioned=True,
-                                            )))
-        self.assertEqual([], returned)
+        changes = [c[1] for c in
+                   tree._iter_changes(basis, want_unversioned=True)]
+        self.assertEqual([(None, 'unversioned'),
+                          (None, 'versioned/unversioned'),
+                          (None, 'versioned2/unversioned'),
+                         ], changes)
+        self.assertEqual(['', 'versioned', 'versioned2'], returned)
+        del returned[:] # reset
+        changes = [c[1] for c in tree._iter_changes(basis)]
+        self.assertEqual([], changes)
+        self.assertEqual(['', 'versioned', 'versioned2'], returned)