Merge lp:~jelmer/bzr-builddeb/fix-do-tests into lp:bzr-builddeb

[Jelmer Vernooij]

This fixes the bzr bd-do tests.

Unmerged revisions

466. By Jelmer Vernooij on 2010-08-06

Fix tests in test_do.

=== modified file 'tests/blackbox/test_do.py'
--- tests/blackbox/test_do.py	2010-07-30 01:25:51 +0000
+++ tests/blackbox/test_do.py	2010-08-11 15:04:45 +0000
@@ -60,14 +60,14 @@
     c.add_change('')
     return c
 
-  def make_unpacked_source(self):
+  def make_unpacked_source(self, path):
     """Create an unpacked source tree in a branch. Return the working tree"""
-    tree = self.make_branch_and_tree('.')
+    tree = self.make_branch_and_tree(path)
     cl_file = 'debian/changelog'
     source_files = ['debian/'] + [cl_file]
-    self.build_tree(source_files)
+    self.build_tree([os.path.join(path, n) for n in source_files])
     c = self.make_changelog()
-    f = open(cl_file, 'wb')
+    f = open(os.path.join(path, cl_file), 'wb')
     try:
       c.write_to_open_file(f)
     finally:
@@ -76,17 +76,18 @@
     return tree
 
   def make_merge_mode_config(self, tree):
-    os.mkdir('.bzr-builddeb/')
-    f = open('.bzr-builddeb/default.conf', 'wb')
+    os.mkdir(os.path.join(tree.basedir, '.bzr-builddeb'))
+    f = open(os.path.join(tree.basedir, '.bzr-builddeb/default.conf'), 'wb')
     try:
       f.write('[BUILDDEB]\nmerge = True\n')
     finally:
       f.close()
     tree.add(['.bzr-builddeb/', '.bzr-builddeb/default.conf'])
 
-  def make_upstream_tarball(self):
+  def make_upstream_tarball(self, path):
+    os.makedirs(path)
     self.build_tree(['test-0.1/', 'test-0.1/a'])
-    tar = tarfile.open(os.path.join('..', 'test_0.1.orig.tar.gz'),
+    tar = tarfile.open(os.path.join(path, 'test_0.1.orig.tar.gz'),
                        'w:gz')
     try:
       tar.add('test-0.1')
@@ -117,66 +118,68 @@
                         '/merge.html for more information.'], 'bd-do true')
 
   def test_fails_no_changelog(self):
-    tree = self.make_branch_and_tree('.')
+    tree = self.make_branch_and_tree('tree')
     self.make_merge_mode_config(tree)
-    self.run_bzr_error(['Could not find changelog'], 'bd-do true')
+    self.run_bzr_error(['Could not find changelog'], 'bd-do true',
+        working_dir="tree")
 
   def test_no_copy_on_fail(self):
-    tree = self.make_unpacked_source()
+    tree = self.make_unpacked_source('tree')
     self.make_merge_mode_config(tree)
-    self.make_upstream_tarball()
+    self.make_upstream_tarball('tarballs')
     self.run_bzr_error(['Not updating the working tree as the command '
-                        'failed.'], ['bd-do', 'touch debian/do && false'])
-    self.failIfExists('debian/do')
+                        'failed.'], ['bd-do', 'touch debian/do && false'],
+                        working_dir="tree")
+    self.failIfExists('tree/debian/do')
 
   def test_copy_on_success(self):
-    tree = self.make_unpacked_source()
+    tree = self.make_unpacked_source('tree')
     self.make_merge_mode_config(tree)
-    self.make_upstream_tarball()
-    self.run_bzr(['bd-do', 'touch debian/do'])
-    self.failUnlessExists('debian/do')
+    self.make_upstream_tarball('tarballs')
+    self.run_bzr(['bd-do', 'touch debian/do'], working_dir="tree")
+    self.failUnlessExists('tree/debian/do')
 
   def test_removed_files_are_removed_in_branch(self):
-    tree = self.make_unpacked_source()
+    tree = self.make_unpacked_source('tree')
     self.make_merge_mode_config(tree)
-    self.make_upstream_tarball()
-    self.run_bzr(['bd-do', 'rm debian/changelog'])
+    self.make_upstream_tarball('tarballs')
+    self.run_bzr(['bd-do', 'rm debian/changelog'], working_dir="tree")
     # It might be nice if this was actually gone, but that would involve
     # either a comaparison, or removing all the files, but the latter is
     # dangerous. I guess it's a TODO to implement the comparison.
-    self.failUnlessExists('debian/changelog')
+    self.failUnlessExists('tree/debian/changelog')
 
   def test_new_directories_created(self):
-    tree = self.make_unpacked_source()
+    tree = self.make_unpacked_source('tree')
     self.make_merge_mode_config(tree)
-    self.make_upstream_tarball()
-    self.run_bzr(['bd-do', 'mkdir debian/dir'])
-    self.failUnlessExists('debian/dir')
+    self.make_upstream_tarball('tarballs')
+    self.run_bzr(['bd-do', 'mkdir debian/dir'], working_dir="tree")
+    self.failUnlessExists('tree/debian/dir')
 
   def test_contents_taken_from_export(self):
-    tree = self.make_unpacked_source()
+    tree = self.make_unpacked_source('tree')
     self.make_merge_mode_config(tree)
-    self.make_upstream_tarball()
-    self.run_bzr(['bd-do', 'echo a > debian/changelog'])
-    self.assertFileEqual('a\n', 'debian/changelog')
+    self.make_upstream_tarball('tarballs')
+    self.run_bzr(['bd-do', 'echo a > debian/changelog'], working_dir="tree")
+    self.assertFileEqual('a\n', 'tree/debian/changelog')
 
   def test_export_purged(self):
-    tree = self.make_unpacked_source()
+    tree = self.make_unpacked_source('tree')
     self.make_merge_mode_config(tree)
-    self.make_upstream_tarball()
-    self.run_bzr(['bd-do', 'echo a > debian/changelog'])
+    self.make_upstream_tarball('tarballs')
+    self.run_bzr(['bd-do', 'echo a > debian/changelog'], working_dir="tree")
     self.failIfExists(self.build_dir())
 
   def test_uses_shell(self):
-    tree = self.make_unpacked_source()
+    tree = self.make_unpacked_source('tree')
     self.make_merge_mode_config(tree)
-    self.make_upstream_tarball()
+    self.make_upstream_tarball('tarballs')
     old_shell = os.environ['SHELL']
     os.environ['SHELL'] = "touch debian/shell"
     try:
-      self.run_bzr('bd-do')
+      self.run_bzr('bd-do', working_dir="tree")
     finally:
       os.environ['SHELL'] = old_shell
-    self.failUnlessExists('debian/shell')
+    self.failUnlessExists('tree/debian/shell')
 
 # vim: ts=2 sts=2 sw=2