Rev 4554: Use a fixed file-id for the root to make the tests more stable. in http://bazaar.launchpad.net/~jameinel/bzr/1.18-bundle-and-stack-393349

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.18-bundle-and-stack-393349

------------------------------------------------------------
revno: 4554
revision-id: john at arbash-meinel.com-20090723000258-qwc6tacl2kw3itqi
parent: john at arbash-meinel.com-20090722220247-fgjydi7g6lbrq92z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-bundle-and-stack-393349
timestamp: Wed 2009-07-22 19:02:58 -0500
message:
  Use a fixed file-id for the root to make the tests more stable.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py	2009-07-22 21:46:59 +0000
+++ b/bzrlib/tests/test_bundle.py	2009-07-23 00:02:58 +0000
@@ -574,8 +574,9 @@
         self.tree1 = self.make_branch_and_tree('b1')
         self.b1 = self.tree1.branch
 
-        open('b1/one', 'wb').write('one\n')
-        self.tree1.add('one')
+        self.build_tree_contents([('b1/one', 'one\n')])
+        self.tree1.add('one', 'one-id')
+        self.tree1.set_root_id('root-id')
         self.tree1.commit('add one', rev_id='a at cset-0-1')
 
         bundle = self.get_valid_bundle('null:', 'a at cset-0-1')
@@ -592,8 +593,8 @@
                 , 'b1/sub/sub/'
                 , 'b1/sub/sub/nonempty.txt'
                 ])
-        open('b1/sub/sub/emptyfile.txt', 'wb').close()
-        open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
+        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
+                                  ('b1/dir/nolastnewline.txt', 'bloop')])
         tt = TreeTransform(self.tree1)
         tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
         tt.apply()
@@ -1335,7 +1336,7 @@
         new_text = self.get_raw(StringIO(''.join(bundle_txt)))
         new_text = new_text.replace('<file file_id="exe-1"',
                                     '<file executable="y" file_id="exe-1"')
-        new_text = new_text.replace('B222', 'B237')
+        new_text = new_text.replace('B260', 'B275')
         bundle_txt = StringIO()
         bundle_txt.write(serializer._get_bundle_header('4'))
         bundle_txt.write('\n')
@@ -1463,10 +1464,10 @@
         new_text = self.get_raw(StringIO(''.join(bundle_txt)))
         # We are going to be replacing some text to set the executable bit on a
         # file. Make sure the text replacement actually works correctly.
-        self.assertContainsRe(new_text, '(?m)B281\n\ni 1\n<inventory')
+        self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
         new_text = new_text.replace('<file file_id="exe-1"',
                                     '<file executable="y" file_id="exe-1"')
-        new_text = new_text.replace('B281', 'B296')
+        new_text = new_text.replace('B244', 'B259')
         bundle_txt = StringIO()
         bundle_txt.write(serializer._get_bundle_header('4'))
         bundle_txt.write('\n')