Merge lp:~jml/pkgme/imports-and-tempdir into lp:pkgme

[Jonathan Lange]

Deprecate TempdirFixture. Use treeshape 0.2.1 instead.

Changes the tests to use treeshape rather than TempdirFixture. This cuts down on lines of code and allows us to delete stuff from pkgme.testing if we so choose, which in turn will simplify dependency touch points.

[James Westby (james-w)]

Looks good.

Thanks,

James

review: Approve

[lp:~jml/pkgme/imports-and-tempdir]

194. By Jonathan Lange on 2012-09-04

Merge trunk, resolving conflicts.

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-09-03 14:31:00 +0000
+++ NEWS.txt	2012-09-04 15:26:25 +0000
@@ -15,14 +15,20 @@
  * New module ``pkgme.api`` that has the useful stuff from the pkgme script.
    (Jonathan Lange)
 
- * ``pkgme.bin.main.get_all_info`` is deprecated.  Use
+
+Deprecations
+------------
+
+ * ``pkgme.bin.main.get_all_info``.  Use
    ``packaging_info_as_data(get_all_info(...))`` instead.  Both are in
    ``pkgme.api``.  (Jonathan Lange)
 
- * ``pkgme.write_packaging`` is deprecated.  Instead use
-   ``pkgme.api.get_all_info`` to get packaging information, and
-   ``pkgme.api.write_packaging_info`` to write it out to disk.
-   (Jonathan Lange)
+ * ``pkgme.write_packaging``.  Instead use ``pkgme.api.get_all_info`` to get
+   packaging information, and ``pkgme.api.write_packaging_info`` to write it
+   out to disk.  (Jonathan Lange)
+
+ * From ``pkgme.testing``, ``TempdirFixture``, ``FileFixture`` and
+   ``ExecutableFileFixture``.  Use ``treeshape.FileTree`` instead.
 
 
 0.3.1 (2012-08-28)
 
=== modified file 'pkgme/testing.py'
--- pkgme/testing.py	2012-08-06 13:26:13 +0000
+++ pkgme/testing.py	2012-09-04 15:26:25 +0000
@@ -1,12 +1,13 @@
 from ConfigParser import ConfigParser
 import os
-import shutil
 from StringIO import StringIO
-import tempfile
 import subprocess
 
 from debian import deb822
-from fixtures import Fixture
+from fixtures import (
+    Fixture,
+    TempDir,
+    )
 from testtools.matchers import (
     Equals,
     Matcher,
@@ -22,12 +23,8 @@
 from pkgme.write import write_file
 
 
-class TempdirFixture(Fixture):
-
-    def setUp(self):
-        Fixture.setUp(self)
-        self.path = tempfile.mkdtemp(prefix="pkgme-tests-")
-        self.addCleanup(shutil.rmtree, self.path)
+class TempdirFixture(TempDir):
+    """DEPRECATED - Use ``treeshape.FileTree`` instead."""
 
     def abspath(self, relpath):
         return os.path.abspath(os.path.join(self.path, relpath))
@@ -53,6 +50,7 @@
 
 
 class FileFixture(Fixture):
+    """DEPRECATED - Use ``treeshape.FileTree`` instead."""
 
     def __init__(self, path, contents):
         super(FileFixture, self).__init__()
@@ -67,6 +65,7 @@
 
 
 class ExecutableFileFixture(FileFixture):
+    """DEPRECATED - Use ``treeshape.FileTree`` instead."""
 
     def setUp(self):
         FileFixture.setUp(self)
 
=== modified file 'pkgme/tests/test_api.py'
--- pkgme/tests/test_api.py	2012-09-03 14:19:36 +0000
+++ pkgme/tests/test_api.py	2012-09-04 15:26:25 +0000
@@ -5,18 +5,18 @@
 from treeshape import HasFileTree
 
 from .. import write_packaging
-from pkgme.api import write_packaging_info
-from pkgme.backend import StaticBackend
-from pkgme.info_elements import (
+from ..api import write_packaging_info
+from ..backend import StaticBackend
+from ..info_elements import (
     Architecture,
     Description,
     Maintainer,
     PackageName,
     Version,
     )
-from pkgme.package_files import Control, DEBIAN_DIR
-from pkgme.project_info import DictInfo
-from pkgme.testing import (
+from ..package_files import Control, DEBIAN_DIR
+from ..project_info import DictInfo
+from ..testing import (
     ControlSourceStanzaHasField,
     StaticLoaderFixture,
     )
 
=== modified file 'pkgme/tests/test_backend.py'
--- pkgme/tests/test_backend.py	2012-08-31 09:23:08 +0000
+++ pkgme/tests/test_backend.py	2012-09-04 15:26:25 +0000
@@ -1,10 +1,14 @@
 import os
 import sys
 
-from fixtures import TestWithFixtures
+from fixtures import TempDir
 from testtools import TestCase
+from treeshape import (
+    FileTree,
+    from_rough_spec,
+    )
 
-from pkgme.backend import (
+from ..backend import (
     Backend,
     BackendSelector,
     EXTERNAL_BACKEND_PATHS,
@@ -19,17 +23,12 @@
     StaticLoader,
     WantError,
     )
-from pkgme.project_info import (
+from ..project_info import (
     MultipleExternalHelpersInfo,
     SingleExternalHelperInfo,
     )
-from pkgme.run_script import ScriptUserError
-from pkgme.testing import (
-    ExecutableFileFixture,
-    FileFixture,
-    StaticLoaderFixture,
-    TempdirFixture,
-    )
+from ..run_script import ScriptUserError
+from ..testing import StaticLoaderFixture
 
 
 class TestBackend(TestCase):
@@ -40,18 +39,17 @@
         self.assertEqual(backend.name, backend.describe())
 
 
-class ExternalHelpersBackendTests(TestCase, TestWithFixtures):
+class ExternalHelpersBackendTests(TestCase):
 
     def make_want_script(self, script, executable=True):
-        tempdir = self.useFixture(TempdirFixture())
-        script_name = ExternalHelpersBackend.WANT_SCRIPT_NAME
-        script_path = os.path.join(tempdir.path, script_name)
         if executable:
-            cls = ExecutableFileFixture
+            permissions = 0700
         else:
-            cls = FileFixture
-        self.useFixture(cls(script_path, script))
-        return tempdir
+            permissions = 0600
+        script_name = ExternalHelpersBackend.WANT_SCRIPT_NAME
+        return self.useFixture(
+            FileTree({script_name: {'content': script,
+                                    'permissions': permissions}}))
 
     def test_describe(self):
         backend = ExternalHelpersBackend(
@@ -145,13 +143,13 @@
         self.assertEqual((10, None), backend.want(tempdir.path))
 
     def test_missing_want_script(self):
-        tempdir = self.useFixture(TempdirFixture())
+        path = self.useFixture(TempDir()).path
         name = self.getUniqueString()
-        backend = ExternalHelpersBackend(name, tempdir.path)
-        e = self.assertRaises(AssertionError, backend.want, tempdir.path)
+        backend = ExternalHelpersBackend(name, path)
+        e = self.assertRaises(AssertionError, backend.want, path)
         self.assertEqual(
             "Backend %s (%s) has no '%s' script"
-            % (name, tempdir.path, ExternalHelpersBackend.WANT_SCRIPT_NAME),
+            % (name, path, ExternalHelpersBackend.WANT_SCRIPT_NAME),
             str(e))
 
     def test_want_script_not_executable(self):
@@ -219,18 +217,18 @@
             str(e))
 
     def test_want_script_run_in_correct_dir(self):
-        cwd_tempdir = self.useFixture(TempdirFixture())
+        cwd_tempdir = self.useFixture(TempDir()).path
         script = """#!%s
 import os
 if os.getcwd() != '%s':
     print "Backend was called in %%s rather than %%s" %% (os.getcwd(), '%s')
 else:
     print 10
-""" % (sys.executable, cwd_tempdir.path, cwd_tempdir.path)
+""" % (sys.executable, cwd_tempdir, cwd_tempdir)
         backend_tempdir = self.make_want_script(script)
         backend = ExternalHelpersBackend(
             self.getUniqueString(), backend_tempdir.path)
-        self.assertEqual((10, None), backend.want(cwd_tempdir.path))
+        self.assertEqual((10, None), backend.want(cwd_tempdir))
 
     def test_get_info_with_multiple(self):
         helpers_path = self.getUniqueString()
@@ -242,18 +240,18 @@
         self.assertEqual(cwd_path, project_info.cwd)
 
     def test_get_info_with_single(self):
-        helpers_tempdir = self.useFixture(TempdirFixture())
+        helpers_tempdir = self.useFixture(TempDir()).path
         info_script_path = os.path.join(
-            helpers_tempdir.path,
+            helpers_tempdir,
             SingleExternalHelperInfo.INFO_SCRIPT_NAME)
         with open(info_script_path, "w"):
             pass
         cwd_path = self.getUniqueString()
         backend = ExternalHelpersBackend(
-            self.getUniqueString(), helpers_tempdir.path)
+            self.getUniqueString(), helpers_tempdir)
         project_info = backend.get_info(cwd_path)
         self.assertIsInstance(project_info, SingleExternalHelperInfo)
-        self.assertEqual(helpers_tempdir.path, project_info.basepath)
+        self.assertEqual(helpers_tempdir, project_info.basepath)
         self.assertEqual(cwd_path, project_info.cwd)
 
 
@@ -415,42 +413,40 @@
             selector.get_eligible_backends(path))
 
 
-class ExternalHelpersBackendLoaderTests(TestCase, TestWithFixtures):
+class ExternalHelpersBackendLoaderTests(TestCase):
+
+    def make_tree(self, *args):
+        return self.useFixture(FileTree(from_rough_spec(args)))
 
     def test_loads_no_backends(self):
-        tempdir = self.useFixture(TempdirFixture())
-        loader = ExternalHelpersBackendLoader([tempdir.path])
+        loader = ExternalHelpersBackendLoader([])
         self.assertEqual([], loader.load())
 
     def test_loads_from_one_dir(self):
-        tempdir = self.useFixture(TempdirFixture())
         backend_name = self.getUniqueString()
-        basepath = tempdir.mkdir(backend_name)
-        loader = ExternalHelpersBackendLoader([tempdir.path])
+        tree = self.make_tree(backend_name + '/')
+        loader = ExternalHelpersBackendLoader([tree.path])
         backends = loader.load()
         self.assertEqual(1, len(backends))
         self.assertIsInstance(backends[0], ExternalHelpersBackend)
         self.assertEqual(backend_name, backends[0].name)
-        self.assertEqual(basepath, backends[0].basepath)
+        self.assertEqual(tree.join(backend_name), backends[0].basepath)
 
     def test_loads_from_two_dirs(self):
-        tempdir1 = self.useFixture(TempdirFixture())
-        tempdir2 = self.useFixture(TempdirFixture())
         backend_name1 = self.getUniqueString()
         backend_name2 = self.getUniqueString()
-        tempdir1.mkdir(backend_name1)
-        tempdir2.mkdir(backend_name2)
+        tempdir1 = self.make_tree(backend_name1 + '/')
+        tempdir2 = self.make_tree(backend_name2 + '/')
         loader = ExternalHelpersBackendLoader(
             [tempdir1.path, tempdir2.path])
         backends = loader.load()
         self.assertEqual(2, len(backends))
 
     def test_loads_only_one_instance_of_each_name(self):
-        tempdir1 = self.useFixture(TempdirFixture())
-        tempdir2 = self.useFixture(TempdirFixture())
         backend_name = self.getUniqueString()
-        basepath1 = tempdir1.mkdir(backend_name)
-        tempdir2.mkdir(backend_name)
+        tempdir1 = self.make_tree(backend_name + '/')
+        tempdir2 = self.make_tree(backend_name + '/')
+        basepath1 = tempdir1.join(backend_name)
         loader = ExternalHelpersBackendLoader(
             [tempdir1.path, tempdir2.path])
         backends = loader.load()
@@ -458,19 +454,17 @@
         self.assertEqual(basepath1, backends[0].basepath)
 
     def test_loads_only_dirs(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch(self.getUniqueString())
-        loader = ExternalHelpersBackendLoader([tempdir.path])
+        path = self.make_tree(self.getUniqueString()).path
+        loader = ExternalHelpersBackendLoader([path])
         self.assertEqual([], loader.load())
 
     def test_ignores_dotdirs(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.mkdir("." + self.getUniqueString())
-        loader = ExternalHelpersBackendLoader([tempdir.path])
+        dirname = '.%s/' % (self.getUniqueString(),)
+        tempdir = self.make_tree(dirname).path
+        loader = ExternalHelpersBackendLoader([tempdir])
         self.assertEqual([], loader.load())
 
     def test_ignores_missing_dirs(self):
-        self.useFixture(TempdirFixture())
         loader = ExternalHelpersBackendLoader([self.getUniqueString()])
         self.assertEqual([], loader.load())
 
 
=== modified file 'pkgme/tests/test_debuild.py'
--- pkgme/tests/test_debuild.py	2012-08-06 18:21:44 +0000
+++ pkgme/tests/test_debuild.py	2012-09-04 15:26:25 +0000
@@ -2,37 +2,26 @@
 import tarfile
 
 from testtools import TestCase
+from treeshape import FileTree
 
-from pkgme.debuild import (
+from ..debuild import (
     _find_binary_files_in_dir,
     build_debian_source_include_binaries_content,
     build_orig_tar_gz,
     )
-from pkgme.testing import (
-    TempdirFixture,
-    )
-
-
-class DebianTempDirFixture(TempdirFixture):
-    """A temp directory with a "testpkg" directory that contains
-       a skeleton dir debian/ structure
-    """
-
-    def setUp(self, with_binary_data=False):
-        super(DebianTempDirFixture, self).setUp()
-        self.pkgdir = self.abspath("testpkg")
-        self.icon_path = os.path.join(self.pkgdir, "debian", "icons")
-        self.debian_source_path = os.path.join(self.pkgdir, "debian", "source")
-        # setup fake env
-        os.makedirs(self.icon_path)
-        os.makedirs(self.debian_source_path)
+
+
+def DebianTempDirFixture():
+    return FileTree(
+        {'debian/icons/': {},
+         'debian/source/': {}})
 
 
 class BuildTarTestCase(TestCase):
 
     def test_build_orig_tar_gz(self):
         tempdir = self.useFixture(DebianTempDirFixture())
-        changelog_path = os.path.join(tempdir.pkgdir, "debian", "changelog")
+        changelog_path = tempdir.join("debian", "changelog")
         with open(changelog_path, "w") as f:
             f.write("""
 testpkg (0.1) unstable; urgency=low
@@ -41,10 +30,10 @@
 
  -- Some Guy <[e-mail]>  Thu, 19 Apr 2012 10:53:30 +0200
 """)
-        with open(os.path.join(tempdir.pkgdir, "canary"), "w") as f:
+        with open(tempdir.join("canary"), "w") as f:
             f.write("pieep")
         # build it
-        result_path = build_orig_tar_gz(tempdir.pkgdir)
+        result_path = build_orig_tar_gz(tempdir.path)
         # verify
         self.assertEqual(
             "testpkg_0.1.orig.tar.gz", os.path.basename(result_path))
@@ -58,14 +47,14 @@
 
     def _make_icons(self, tempdir):
         for icon_name in ["foo.png", "bar.png"]:
-            with open(os.path.join(tempdir.icon_path, icon_name), "w") as f:
+            icon_path = tempdir.join('debian', 'icons', icon_name)
+            with open(icon_path, "w") as f:
                 f.write("x\0x")
 
     def test_find_binary_files(self):
         tempdir = self.useFixture(DebianTempDirFixture())
         self._make_icons(tempdir)
-        bin_files = _find_binary_files_in_dir(os.path.join(
-                tempdir.pkgdir, "debian"))
+        bin_files = _find_binary_files_in_dir(tempdir.join('debian'))
         self.assertEqual(
             sorted(["icons/foo.png", "icons/bar.png"]),
             sorted(bin_files))
@@ -73,11 +62,10 @@
     def test_build_debian_source_include_binaries_content(self):
         tempdir = self.useFixture(DebianTempDirFixture())
         self._make_icons(tempdir)
-        build_debian_source_include_binaries_content(tempdir.pkgdir)
+        build_debian_source_include_binaries_content(tempdir.path)
         expected_binaries = sorted(
             ['debian/icons/foo.png', 'debian/icons/bar.png'])
-        include_binaries = os.path.join(
-            tempdir.debian_source_path, "include-binaries")
+        include_binaries = tempdir.join('debian', 'source', "include-binaries")
         with open(include_binaries) as f:
             found_binaries = sorted(line.strip() for line in f.readlines())
         self.assertEqual(expected_binaries, found_binaries)
 
=== modified file 'pkgme/tests/test_distutils_command.py'
--- pkgme/tests/test_distutils_command.py	2012-05-28 21:37:22 +0000
+++ pkgme/tests/test_distutils_command.py	2012-09-04 15:26:25 +0000
@@ -1,14 +1,15 @@
 from distutils.dist import Distribution
 import json
+import os
 
-from fixtures import TestWithFixtures
+from fixtures import TempDir
 from testtools import TestCase
 
-from pkgme.distutils_command.pkgme_info import pkgme_info
-from pkgme.testing import PathRequiredTestCase, TempdirFixture
-
-
-class pkgme_info_tests(TestCase, TestWithFixtures, PathRequiredTestCase):
+from ..distutils_command.pkgme_info import pkgme_info
+from ..testing import PathRequiredTestCase
+
+
+class pkgme_info_tests(TestCase, PathRequiredTestCase):
 
     def test_interprets_pkgmeinfo(self):
         dist = Distribution()
@@ -26,8 +27,8 @@
         self.assertEqual([], cmd.pkgmeinfo)
 
     def test_provides_requested_information(self):
-        tempdir = self.useFixture(TempdirFixture())
-        out_path = tempdir.abspath('output')
+        tempdir = self.useFixture(TempDir()).path
+        out_path = os.path.join(tempdir, 'output')
         name = self.getUniqueString()
         dist = Distribution(dict(name=name))
         cmd = pkgme_info(dist)
@@ -41,8 +42,8 @@
         self.assertEqual({"package_name": name}, output)
 
     def test_skips_unknown_info(self):
-        tempdir = self.useFixture(TempdirFixture())
-        out_path = tempdir.abspath("output")
+        tempdir = self.useFixture(TempDir()).path
+        out_path = os.path.join(tempdir, "output")
         name = self.getUniqueString()
         dist = Distribution(dict(name=name))
         cmd = pkgme_info(dist)
 
=== modified file 'pkgme/tests/test_info_elements.py'
--- pkgme/tests/test_info_elements.py	2012-08-21 15:13:44 +0000
+++ pkgme/tests/test_info_elements.py	2012-09-04 15:26:25 +0000
@@ -3,7 +3,7 @@
 from fixtures import EnvironmentVariableFixture
 from testtools import TestCase
 
-from pkgme.info_elements import (
+from ..info_elements import (
     BuildDepends,
     debian_formatted_text,
     Description,
@@ -16,7 +16,7 @@
     MissingInfoError,
     PackageName,
     )
-from pkgme.project_info import DictInfo
+from ..project_info import DictInfo
 
 
 class TestElement(InfoElement):
 
=== modified file 'pkgme/tests/test_main.py'
--- pkgme/tests/test_main.py	2012-08-31 10:28:27 +0000
+++ pkgme/tests/test_main.py	2012-09-04 15:26:25 +0000
@@ -1,12 +1,12 @@
 from testtools import TestCase
 
-from pkgme import __version__
-from pkgme.backend import (
+from .. import __version__
+from ..backend import (
     EXTERNAL_BACKEND_PATHS,
     StaticBackend,
     )
-from pkgme.bin.main import get_version_info
-from pkgme.testing import StaticLoaderFixture
+from ..bin.main import get_version_info
+from ..testing import StaticLoaderFixture
 
 
 class TestVersionInfo(TestCase):
 
=== modified file 'pkgme/tests/test_package_files.py'
--- pkgme/tests/test_package_files.py	2012-08-21 15:26:20 +0000
+++ pkgme/tests/test_package_files.py	2012-09-04 15:26:25 +0000
@@ -5,8 +5,9 @@
 from debian import changelog
 from testtools import TestCase
 from testtools.matchers import StartsWith
+from treeshape import FileTree
 
-from pkgme.info_elements import (
+from ..info_elements import (
     Architecture,
     ApplicationName,
     BuildDepends,
@@ -32,7 +33,7 @@
     Version,
     WorkingDirectory,
     )
-from pkgme.package_files import (
+from ..package_files import (
     BasicFile,
     Changelog,
     Compat,
@@ -46,14 +47,13 @@
     Rules,
     TemplatePackageFile,
     )
-from pkgme.project_info import DictInfo
-from pkgme.testing import (
+from ..project_info import DictInfo
+from ..testing import (
     AreDesktopValuesFor,
     ControlStanzaHasField,
     ControlStanzaDoesntHaveField,
     ControlSourceStanzaHasField,
     ControlSourceStanzaDoesntHaveField,
-    TempdirFixture,
     )
 
 
@@ -610,21 +610,19 @@
         self.assertEqual(True, foo.overwrite)
 
     def test_extra_files_from_paths(self):
-        tempdir = self.useFixture(TempdirFixture())
-        filename1 = 'foo'
-        filename2 = 'bar'
-        content1 = 'This is foo'
-        content2 = 'This is bar'
-        tempdir.create_file(filename1, content1)
-        tempdir.create_file(filename2, content2)
+        foo_content = self.getUniqueString()
+        tree = self.useFixture(
+            FileTree(
+                {'foo': {'content': foo_content},
+                 'bar': {}}))
         group = PackageFileGroup()
         project_info = DictInfo({
             ExtraFilesFromPaths.name: {
-                'foo.txt': tempdir.abspath(filename1),
-                'debian/install': tempdir.abspath(filename2),
+                'foo.txt': tree.join('foo'),
+                'debian/install': tree.join('bar'),
                 }})
         files = group.get_files(project_info)
         [foo, install] = files
         self.assertEqual('foo.txt', foo.path)
-        self.assertEqual(content1, foo.get_contents())
+        self.assertEqual(foo_content, foo.get_contents())
         self.assertEqual(True, foo.overwrite)
 
=== modified file 'pkgme/tests/test_project_info.py'
--- pkgme/tests/test_project_info.py	2011-10-31 18:15:27 +0000
+++ pkgme/tests/test_project_info.py	2012-09-04 15:26:25 +0000
@@ -1,24 +1,24 @@
 import json
 import sys
 
-from fixtures import TestWithFixtures
+from fixtures import TempDir
 from testtools import TestCase
+from treeshape import (
+    CONTENT,
+    FileTree,
+    PERMISSIONS,
+    )
 
-from pkgme.project_info import (
+from ..project_info import (
     DictInfo,
     FallbackInfo,
     MultipleExternalHelpersInfo,
     SingleExternalHelperInfo,
     )
-from pkgme.run_script import (
+from ..run_script import (
     ScriptFailed,
     ScriptPermissionDenied,
     )
-from pkgme.testing import (
-    ExecutableFileFixture,
-    FileFixture,
-    TempdirFixture,
-    )
 
 
 class DictInfoTests(TestCase):
@@ -81,70 +81,70 @@
         self.assertEqual({key: value1}, info.get_all([key]))
 
 
-class MultipleExternalHelpersInfoTests(TestCase, TestWithFixtures):
+class MultipleExternalHelpersInfoTests(TestCase):
+
+    def make_script(self, name, contents, permission=0700):
+        return self.useFixture(
+            FileTree({name: {CONTENT: contents,
+                             PERMISSIONS: permission}})).path
 
     def test_missing_helper(self):
-        tempdir = self.useFixture(TempdirFixture())
-        info = MultipleExternalHelpersInfo(tempdir.path, tempdir.path)
+        tempdir = self.useFixture(TempDir()).path
+        info = MultipleExternalHelpersInfo(tempdir, tempdir)
         key = self.getUniqueString()
         self.assertEqual({key: None}, info.get_all([key]))
 
     def test_uses_output(self):
-        tempdir = self.useFixture(TempdirFixture())
         script_name = self.getUniqueString()
-        script_path = tempdir.abspath(script_name)
         value = self.getUniqueString()
         script = "#!/bin/sh\necho %s\n" % value
-        self.useFixture(ExecutableFileFixture(script_path, script))
-        info = MultipleExternalHelpersInfo(tempdir.path, tempdir.path)
+        tempdir = self.make_script(script_name, script)
+        info = MultipleExternalHelpersInfo(tempdir, tempdir)
         self.assertEqual({script_name: value}, info.get_all([script_name]))
 
     def test_script_error(self):
-        tempdir = self.useFixture(TempdirFixture())
         script_name = self.getUniqueString()
-        script_path = tempdir.abspath(script_name)
         script = "#!/bin/sh\nexit 1\n"
-        self.useFixture(ExecutableFileFixture(script_path, script))
-        info = MultipleExternalHelpersInfo(tempdir.path, tempdir.path)
+        tempdir = self.make_script(script_name, script)
+        info = MultipleExternalHelpersInfo(tempdir, tempdir)
         self.assertRaises(
             ScriptFailed, info.get_all, [script_name])
 
     def test_script_permission_denied(self):
         """Check the exception raised when the info script isn't executable."""
-        tempdir = self.useFixture(TempdirFixture())
         script_name = self.getUniqueString()
-        script_path = tempdir.abspath(script_name)
         script = "#!/bin/sh\nexit 0\n"
-        self.useFixture(FileFixture(script_path, script))
-        info = MultipleExternalHelpersInfo(tempdir.path, tempdir.path)
+        tempdir = self.make_script(script_name, script, 0644)
+        info = MultipleExternalHelpersInfo(tempdir, tempdir)
         self.assertRaises(
             ScriptPermissionDenied, info.get_all, [script_name])
 
     def test_correct_working_directory(self):
-        script_tempdir = self.useFixture(TempdirFixture())
-        cwd_tempdir = self.useFixture(TempdirFixture())
+        cwd_tempdir = self.useFixture(TempDir()).path
         script_name = self.getUniqueString()
-        script_path = script_tempdir.abspath(script_name)
         script = "#!%s\nimport os\nprint os.getcwd()\n" % sys.executable
-        self.useFixture(ExecutableFileFixture(script_path, script))
-        info = MultipleExternalHelpersInfo(
-            script_tempdir.path, cwd_tempdir.path)
+        script_tempdir = self.make_script(script_name, script)
+        info = MultipleExternalHelpersInfo(script_tempdir, cwd_tempdir)
         self.assertEqual(
-            {script_name: cwd_tempdir.path}, info.get_all([script_name]))
-
-
-class SingleExternalHelperInfoTests(TestCase, TestWithFixtures):
+            {script_name: cwd_tempdir}, info.get_all([script_name]))
+
+
+class SingleExternalHelperInfoTests(TestCase):
+
+    def make_script(self, contents, permission=0700):
+        name = SingleExternalHelperInfo.INFO_SCRIPT_NAME
+        return self.useFixture(
+            FileTree({name: {CONTENT: contents,
+                             PERMISSIONS: permission}}))
 
     def test_uses_output(self):
-        tempdir = self.useFixture(TempdirFixture())
-        script_name = self.getUniqueString()
-        script_path = tempdir.abspath(SingleExternalHelperInfo.INFO_SCRIPT_NAME)
+        element_name = self.getUniqueString()
         value = self.getUniqueString()
         script = '#!%s\nimport json\nprint json.dumps(%s)\n' % (
-            sys.executable, json.dumps({script_name: value}))
-        self.useFixture(ExecutableFileFixture(script_path, script))
-        info = SingleExternalHelperInfo(tempdir.path, tempdir.path)
-        self.assertEqual({script_name: value}, info.get_all([script_name]))
+            sys.executable, json.dumps({element_name: value}))
+        tempdir = self.make_script(script).path
+        info = SingleExternalHelperInfo(tempdir, tempdir)
+        self.assertEqual({element_name: value}, info.get_all([element_name]))
 
     def test_when_script_gives_invalid_json_output(self):
         """Test when the script doesn't produce valid JSON.
@@ -152,48 +152,42 @@
         As this is a problem with the backend we expect an AssertionError
         with an intelligible message.
         """
-        tempdir = self.useFixture(TempdirFixture())
-        script_path = tempdir.abspath(SingleExternalHelperInfo.INFO_SCRIPT_NAME)
-        value = self.getUniqueString()
         script = '#!%s\nprint "}Nonsense"' % (sys.executable, )
-        self.useFixture(ExecutableFileFixture(script_path, script))
+        tempdir = self.make_script(script)
         info = SingleExternalHelperInfo(tempdir.path, tempdir.path)
         e = self.assertRaises(AssertionError, info.get_all, [])
-        self.assertEquals("%s didn't return valid JSON: '}Nonsense\\n'"
-                % (script_path, ), str(e))
+        self.assertEquals(
+            "%s didn't return valid JSON: '}Nonsense\\n'" % (
+                tempdir.join(SingleExternalHelperInfo.INFO_SCRIPT_NAME),),
+            str(e))
 
     def test_passes_input(self):
-        tempdir = self.useFixture(TempdirFixture())
-        script_name = self.getUniqueString()
-        script_path = tempdir.abspath(SingleExternalHelperInfo.INFO_SCRIPT_NAME)
+        element_name = self.getUniqueString()
         value = self.getUniqueString()
-        script = """#!%s
+        script = """#!%(python)s
 import json
 import sys
 
 raw_input = sys.stdin.read()
 input = json.loads(raw_input)
-if input != ["%s"]:
-    print json.dumps({"%s": "Did not pass correct input: %%s" %% raw_input})
+if input != ["%(element)s"]:
+    print json.dumps({"%(element)s": "Did not pass correct input: %%s" %% raw_input})
 else:
-    print json.dumps({"%s": "%s"})
-""" % (sys.executable, script_name, script_name, script_name, value)
-        self.useFixture(ExecutableFileFixture(script_path, script))
-        info = SingleExternalHelperInfo(tempdir.path, tempdir.path)
-        self.assertEqual({script_name: value}, info.get_all([script_name]))
+    print json.dumps({"%(element)s": "%(value)s"})
+""" % {'python': sys.executable, 'element': element_name, 'value': value}
+        tempdir = self.make_script(script).path
+        info = SingleExternalHelperInfo(tempdir, tempdir)
+        self.assertEqual({element_name: value}, info.get_all([element_name]))
 
     def test_correct_working_directory(self):
-        script_tempdir = self.useFixture(TempdirFixture())
-        cwd_tempdir = self.useFixture(TempdirFixture())
-        script_name = self.getUniqueString()
-        script_path = script_tempdir.abspath(SingleExternalHelperInfo.INFO_SCRIPT_NAME)
+        cwd_tempdir = self.useFixture(TempDir())
+        element_name = self.getUniqueString()
         script = """#!%s
 import os
 import json
 print json.dumps({"%s": os.getcwd()})
-""" % (sys.executable, script_name)
-        self.useFixture(ExecutableFileFixture(script_path, script))
-        info = SingleExternalHelperInfo(
-            script_tempdir.path, cwd_tempdir.path)
+""" % (sys.executable, element_name)
+        script_tempdir = self.make_script(script).path
+        info = SingleExternalHelperInfo(script_tempdir, cwd_tempdir.path)
         self.assertEqual(
-            {script_name: cwd_tempdir.path}, info.get_all([script_name]))
+            {element_name: cwd_tempdir.path}, info.get_all([element_name]))
 
=== modified file 'pkgme/tests/test_python_backend.py'
--- pkgme/tests/test_python_backend.py	2012-09-03 10:42:06 +0000
+++ pkgme/tests/test_python_backend.py	2012-09-04 15:26:25 +0000
@@ -1,33 +1,32 @@
-from fixtures import TestWithFixtures
 from testtools import TestCase
+from treeshape import FileTree
 
-from pkgme.backend import ExternalHelpersBackend, get_backend_dir
-from pkgme.testing import TempdirFixture
+from ..backend import ExternalHelpersBackend, get_backend_dir
 
 
 backend_dir = get_backend_dir(__file__, 'python')
 
 
-class PythonBackendTests(TestCase, TestWithFixtures):
+class PythonBackendTests(TestCase):
 
     def test_want_with_setup_py(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('setup.py')
+        tempdir = self.useFixture(FileTree({'setup.py': {}}))
         backend = ExternalHelpersBackend("python", backend_dir)
         self.assertEqual((20, None), backend.want(tempdir.path))
 
     def test_want_without_setup_py(self):
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(FileTree({}))
         backend = ExternalHelpersBackend("python", backend_dir)
         self.assertEqual(
             (0, "Couldn't find a setup.py"), backend.want(tempdir.path))
 
     def test_all_info(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file('setup.py', """from distutils.core import setup
+        tempdir = self.useFixture(
+            FileTree({'setup.py': {'content': """\
+from distutils.core import setup
 
 setup(name="foo")
-""")
+"""}}))
         backend = ExternalHelpersBackend("python", backend_dir)
         info = backend.get_info(tempdir.path)
         info = info.get_all(['package_name'])
 
=== modified file 'pkgme/tests/test_run_script.py'
--- pkgme/tests/test_run_script.py	2012-08-22 13:37:48 +0000
+++ pkgme/tests/test_run_script.py	2012-09-04 15:26:25 +0000
@@ -2,7 +2,7 @@
 
 from testtools import TestCase
 
-from pkgme.run_script import (
+from ..run_script import (
     ScriptFailed,
     ScriptUserError,
     )
 
=== modified file 'pkgme/tests/test_script.py'
--- pkgme/tests/test_script.py	2012-09-04 15:17:02 +0000
+++ pkgme/tests/test_script.py	2012-09-04 15:26:25 +0000
@@ -13,16 +13,13 @@
     DirExists,
     Not,
     )
+from treeshape import FileTree
 
 from ..api import (
     get_all_info,
     load_backends,
     packaging_info_as_data,
     )
-from ..backend import StaticBackend
-from ..info_elements import PackageName
-from ..project_info import DictInfo
-from ..testing import TempdirFixture
 
 
 class ScriptTests(TestCase):
@@ -54,23 +51,21 @@
         self.assertEqual('', stderr.getvalue())
         return stdout.getvalue()
 
-    def create_marker_file(self, tempdir, prefix=None):
+    def create_marker_file(self, prefix=None):
         """Create the file that triggers the dummy backend for testing."""
         path = "is_pkgme_test"
         if prefix is not None:
             path = os.path.join(prefix, path)
-        tempdir.create_file(path, "")
+        return self.useFixture(FileTree({path: {}}))
 
     def test_writes_files(self):
-        tempdir = self.useFixture(TempdirFixture())
-        self.create_marker_file(tempdir)
+        tempdir = self.create_marker_file()
         self.run_script(tempdir.path)
-        self.assertThat(tempdir.abspath("debian"), DirExists())
+        self.assertThat(tempdir.join("debian"), DirExists())
 
     def test_builds_source_package(self):
-        tempdir = self.useFixture(TempdirFixture())
-        self.create_marker_file(tempdir, prefix="foo")
-        self.run_script(tempdir.abspath('foo'))
+        tempdir = self.create_marker_file(prefix="foo")
+        self.run_script(tempdir.join('foo'))
         self.assertThat(tempdir.path, DirContains(
             ["foo_0.0.0.orig.tar.gz",
              "foo_0.0.0.debian.tar.gz",
@@ -81,31 +76,27 @@
              ]))
 
     def test_nobuild_doesnt_builds_source_package(self):
-        tempdir = self.useFixture(TempdirFixture())
-        self.create_marker_file(tempdir, prefix="foo")
-        self.run_script(tempdir.abspath('foo'), ['--nobuild'])
+        tempdir = self.create_marker_file(prefix="foo")
+        self.run_script(tempdir.join('foo'), ['--nobuild'])
         self.assertThat(tempdir.path, DirContains(["foo"]))
 
     def test_which_backends(self):
-        tempdir = self.useFixture(TempdirFixture())
-        self.create_marker_file(tempdir)
+        tempdir = self.create_marker_file()
         output = self.run_script(tempdir.path, ['--which-backends'])
         self.assertEqual('dummy (100)\n', output)
-        self.assertThat(tempdir.abspath("debian"), Not(DirExists()))
+        self.assertThat(tempdir.join("debian"), Not(DirExists()))
 
     def test_dump(self):
-        tempdir = self.useFixture(TempdirFixture())
-        self.create_marker_file(tempdir)
+        tempdir = self.create_marker_file()
         all_info = get_all_info(tempdir.path, load_backends())
         clean_info = packaging_info_as_data(all_info)
         output = self.run_script(tempdir.path, ['--dump'])
         self.assertEqual(clean_info, json.loads(output))
-        self.assertThat(tempdir.abspath("debian"), Not(DirExists()))
+        self.assertThat(tempdir.join("debian"), Not(DirExists()))
 
     def test_nosign(self):
-        tempdir = self.useFixture(TempdirFixture())
-        self.create_marker_file(tempdir, prefix='foo')
-        self.run_script(tempdir.abspath('foo'), ['--nosign'])
+        tempdir = self.create_marker_file(prefix='foo')
+        self.run_script(tempdir.join('foo'), ['--nosign'])
         changes_file = os.path.join(tempdir.path,
                                     "foo_0.0.0_source.changes")
         signature = open(changes_file)
 
=== modified file 'pkgme/tests/test_template_file.py'
--- pkgme/tests/test_template_file.py	2010-11-05 20:29:46 +0000
+++ pkgme/tests/test_template_file.py	2012-09-04 15:26:25 +0000
@@ -1,6 +1,6 @@
 from testtools import TestCase
 
-from pkgme.template_file import TemplateFile
+from ..template_file import TemplateFile
 
 
 class TemplateFileTests(TestCase):
 
=== modified file 'pkgme/tests/test_testing.py'
--- pkgme/tests/test_testing.py	2012-08-06 13:26:01 +0000
+++ pkgme/tests/test_testing.py	2012-09-04 15:26:25 +0000
@@ -6,7 +6,7 @@
     FileContains,
     )
 
-from pkgme.testing import (
+from ..testing import (
     TempdirFixture,
     )
 
 
=== modified file 'pkgme/tests/test_trace.py'
--- pkgme/tests/test_trace.py	2012-01-19 12:18:32 +0000
+++ pkgme/tests/test_trace.py	2012-09-04 15:26:25 +0000
@@ -1,11 +1,14 @@
 import os
 
-from fixtures import EnvironmentVariableFixture
+from fixtures import (
+    EnvironmentVariableFixture,
+    TempDir,
+    TempHomeDir,
+    )
 from testtools import TestCase
 from testtools.matchers import MatchesRegex
 
-from pkgme.testing import TempdirFixture
-from pkgme import trace
+from .. import trace
 
 
 _date_time_re = r'\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d,\d\d\d'
@@ -13,9 +16,7 @@
 class TestLogging(TestCase):
 
     def with_temp_home(self):
-        temp_dir = self.useFixture(TempdirFixture())
-        self.useFixture(EnvironmentVariableFixture('HOME', temp_dir.path))
-        return temp_dir
+        return self.useFixture(TempHomeDir())
 
     def with_temp_log(self):
         self.with_temp_home()
@@ -31,8 +32,8 @@
 
     def test_log_location_from_env_var(self):
         # If PKGME_LOG_DIR is set in the environment we log there.
-        temp_home = self.with_temp_home()
-        temp_dir = self.useFixture(TempdirFixture())
+        self.with_temp_home()
+        temp_dir = self.useFixture(TempDir())
         self.useFixture(EnvironmentVariableFixture('PKGME_LOG_DIR', temp_dir.path))
         log_location = trace.get_log_location()
         self.assertEqual(os.path.join(temp_dir.path, 'pkgme.log'), log_location)
 
=== modified file 'pkgme/tests/test_upload.py'
--- pkgme/tests/test_upload.py	2011-08-01 18:11:44 +0000
+++ pkgme/tests/test_upload.py	2012-09-04 15:26:25 +0000
@@ -1,6 +1,6 @@
 from testtools import TestCase
 
-from pkgme.upload import (
+from ..upload import (
     CannotUpload,
     InvalidPPAName,
     NoSuchPerson,
 
=== modified file 'pkgme/tests/test_vala_backend.py'
--- pkgme/tests/test_vala_backend.py	2012-04-27 14:45:31 +0000
+++ pkgme/tests/test_vala_backend.py	2012-09-04 15:26:25 +0000
@@ -18,116 +18,108 @@
 # Authors: Michael Terry <[e-mail]>
 # =====================================================================
 
-import os
-
-from fixtures import TestWithFixtures
+from fixtures import TempDir
 from testtools import TestCase
+from treeshape import FileTree, from_rough_spec
 
-from pkgme.backend import ExternalHelpersBackend, get_backend_dir
-from pkgme.testing import CommandRequiredTestCase, TempdirFixture
+from ..backend import ExternalHelpersBackend, get_backend_dir
+from ..testing import CommandRequiredTestCase
 
 
 backend_dir = get_backend_dir(__file__, 'vala')
 
 
-class ValaBackendTests(TestCase, TestWithFixtures, CommandRequiredTestCase):
+class ValaBackendTests(TestCase, CommandRequiredTestCase):
 
-    def setUp(self):
-        super(ValaBackendTests, self).setUp()
-        self.tempdir = self.useFixture(TempdirFixture())
+    def make_tree(self, *spec):
+        return self.useFixture(FileTree(from_rough_spec(spec)))
 
     def get_backend(self):
         return ExternalHelpersBackend("vala", backend_dir)
 
-    def get_info(self):
-        backend = self.get_backend()
-        return backend.get_info(self.tempdir.path)
-
     def test_want_zero_deep(self):
-        self.tempdir.create_file("configure.ac", "")
-        self.tempdir.create_file("main.vala", "")
+        tempdir = self.make_tree('configure.ac', 'main.vala')
         backend = self.get_backend()
-        self.assertEqual((20, None), backend.want(self.tempdir.path))
+        self.assertEqual((20, None), backend.want(tempdir.path))
 
     def test_want_one_deep(self):
-        self.tempdir.create_file("configure.ac", "")
-        self.tempdir.create_file(os.path.join("one", "main.vala"), "")
+        tempdir = self.make_tree("configure.ac", "one/main.vala")
         backend = self.get_backend()
-        self.assertEqual((20, None), backend.want(self.tempdir.path))
+        self.assertEqual((20, None), backend.want(tempdir.path))
 
     def test_want_two_deep(self):
-        self.tempdir.create_file("configure.ac", "")
-        self.tempdir.create_file(
-            os.path.join("one", "two", "main.vala"), "")
+        tempdir = self.make_tree("configure.ac", "one/two/main.vala")
         backend = self.get_backend()
-        self.assertEqual((0, None), backend.want(self.tempdir.path))
+        self.assertEqual((0, None), backend.want(tempdir.path))
 
     def test_want_without_configure_ac(self):
-        self.tempdir.create_file("main.vala", "")
+        tempdir = self.make_tree("main.vala")
         backend = self.get_backend()
-        self.assertEqual((0, None), backend.want(self.tempdir.path))
+        self.assertEqual((0, None), backend.want(tempdir.path))
 
     def test_want_with_configure_in(self):
-        self.tempdir.create_file("configure.in", "")
-        self.tempdir.create_file("main.vala", "")
+        tempdir = self.make_tree("main.vala", "configure.in")
         backend = self.get_backend()
-        self.assertEqual((20, None), backend.want(self.tempdir.path))
+        self.assertEqual((20, None), backend.want(tempdir.path))
 
     def test_architecture(self):
-        info = self.get_info()
+        tempdir = self.useFixture(TempDir())
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"architecture": "any"}, info.get_all(["architecture"]))
 
     def test_buildsystem(self):
-        info = self.get_info()
+        tempdir = self.useFixture(TempDir())
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"buildsystem": "autoconf"}, info.get_all(["buildsystem"]))
 
     def test_build_depends(self):
         self.skipTestIfCommandNotExecutable('vala-dep-scanner')
-        self.tempdir.create_file("main.vala", "Gtk.Window win;")
-        info = self.get_info()
+        tempdir = self.make_tree(("main.vala", "Gtk.Window win;"))
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"build_depends": "libgtk3.0-dev, valac"},
             info.get_all(["build_depends"]))
 
     def test_depends(self):
-        info = self.get_info()
+        tempdir = self.useFixture(TempDir())
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"depends": "${shlibs:Depends}"}, info.get_all(["depends"]))
 
     def test_homepage(self):
-        self.tempdir.create_file(
-            "configure.ac",
-            "AC_INIT([Example Project],[1.0],[http://bugs.example.com/],"
-            "[example-project], [http://example.com/] )")
-        info = self.get_info()
+        tempdir = self.make_tree(
+            ("configure.ac",
+             "AC_INIT([Example Project],[1.0],[http://bugs.example.com/],"
+             "[example-project], [http://example.com/] )"))
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"homepage": "http://example.com/"}, info.get_all(["homepage"]))
 
     def test_homepage_none(self):
-        self.tempdir.create_file(
-            "configure.ac",
-            "AC_INIT([Example Project],[1.0],[http://bugs.example.com/],"
-            "[example-project])")
-        info = self.get_info()
+        tempdir = self.make_tree(
+            ("configure.ac",
+             "AC_INIT([Example Project],[1.0],[http://bugs.example.com/],"
+             "[example-project])"))
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"homepage": ""}, info.get_all(["homepage"]))
 
     def test_package_name(self):
-        self.tempdir.create_file(
-            "configure.ac",
-            "AC_INIT([GNU Example Project],[1.0],[http://bugs.example.com/],"
-            "[co ol-proj],[http://example.com/])")
-        info = self.get_info()
+        tempdir = self.make_tree(
+            ("configure.ac",
+             "AC_INIT([GNU Example Project],[1.0],[http://bugs.example.com/],"
+             "[co ol-proj],[http://example.com/])"))
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"package_name": "co ol-proj"}, info.get_all(["package_name"]))
 
     def test_package_name_none(self):
-        self.tempdir.create_file(
-            "configure.ac",
-            "AC_INIT( [GNU Example Project] , [1.0],"
-            "[http://bugs.example.com/])")
-        info = self.get_info()
+        tempdir = self.make_tree(
+            ("configure.ac",
+             "AC_INIT( [GNU Example Project] , [1.0],"
+             "[http://bugs.example.com/])"))
+        info = self.get_backend().get_info(tempdir.path)
         self.assertEqual(
             {"package_name": "example-project"}, info.get_all(["package_name"]))
 
=== modified file 'pkgme/tests/test_write.py'
--- pkgme/tests/test_write.py	2012-08-06 13:26:01 +0000
+++ pkgme/tests/test_write.py	2012-09-04 15:26:25 +0000
@@ -1,6 +1,6 @@
 import os
 
-from fixtures import TestWithFixtures
+from fixtures import TempDir
 from testtools import TestCase
 from testtools.matchers import (
     DirExists,
@@ -8,16 +8,17 @@
     PathExists,
     )
 
-from pkgme.package_files import PackageFile
-from pkgme.testing import (
-    TempdirFixture,
-    )
-from pkgme.write import (
+from ..package_files import PackageFile
+from ..write import (
     write_file,
     Writer,
     )
 
 
+def abspath(fixture, *segments):
+    return os.path.join(fixture.path, *segments)
+
+
 class SimplePackageFile(PackageFile):
 
     def __init__(self, path, contents="", overwrite=True):
@@ -29,80 +30,80 @@
         return self.contents
 
 
-class WriterTests(TestCase, TestWithFixtures):
+class WriterTests(TestCase):
 
     def get_writer(self):
         return Writer()
 
     def do_write(self, tempdir=None):
         if tempdir is None:
-            tempdir = self.useFixture(TempdirFixture())
+            tempdir = self.useFixture(TempDir())
         writer = self.get_writer()
         writer.write(tempdir.path)
         return tempdir
 
     def test_write_creates_target_dir(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
-        target_dir = tempdir.abspath(self.getUniqueString())
+        tempdir = self.useFixture(TempDir())
+        target_dir = abspath(tempdir, self.getUniqueString())
         writer.write(
             [SimplePackageFile(self.getUniqueString())], target_dir)
         self.assertThat(target_dir, DirExists())
 
     def test_write_creates_needed_subdirs(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         subdir = self.getUniqueString()
         package_file = SimplePackageFile(
             os.path.join(subdir, self.getUniqueString()))
         writer.write([package_file], tempdir.path)
-        self.assertThat(tempdir.abspath(subdir), DirExists())
+        self.assertThat(abspath(tempdir, subdir), DirExists())
 
     def test_write_accepts_existing_subdir(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         subdir = self.getUniqueString()
         package_file = SimplePackageFile(
             os.path.join(subdir, self.getUniqueString()))
-        os.makedirs(tempdir.abspath(subdir))
+        os.makedirs(abspath(tempdir, subdir))
         writer.write([package_file], tempdir.path)
-        self.assertThat(tempdir.abspath(subdir), DirExists())
+        self.assertThat(abspath(tempdir, subdir), DirExists())
 
     def test_write_creates_file(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         filename = self.getUniqueString()
         package_file = SimplePackageFile(filename)
         writer.write([package_file], tempdir.path)
-        self.assertThat(tempdir.abspath(filename), PathExists())
+        self.assertThat(abspath(tempdir, filename), PathExists())
 
     def test_write_creates_file_with_correct_contents(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         filename = self.getUniqueString()
         contents = self.getUniqueString()
         package_file = SimplePackageFile(filename, contents=contents)
         writer.write([package_file], tempdir.path)
-        self.assertThat(tempdir.abspath(filename), FileContains(contents))
+        self.assertThat(abspath(tempdir, filename), FileContains(contents))
 
     def test_write_creates_all_files(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         filename1 = self.getUniqueString()
         package_file1 = SimplePackageFile(filename1)
         filename2 = self.getUniqueString()
         package_file2 = SimplePackageFile(filename2)
         writer.write([package_file1, package_file2], tempdir.path)
-        self.assertThat(tempdir.abspath(filename1), PathExists())
-        self.assertThat(tempdir.abspath(filename2), PathExists())
+        self.assertThat(abspath(tempdir, filename1), PathExists())
+        self.assertThat(abspath(tempdir, filename2), PathExists())
 
     def test_write_overwrites(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         original_contents = self.getUniqueString()
         new_contents = self.getUniqueString()
         filename = self.getUniqueString()
-        target_path = tempdir.abspath(filename)
+        target_path = abspath(tempdir, filename)
         write_file(target_path, original_contents)
         package_file = SimplePackageFile(
             filename, contents=new_contents, overwrite=True)
@@ -111,11 +112,11 @@
 
     def test_write_doesnt_overwrite_files_with_overwrite_False(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         original_contents = self.getUniqueString()
         new_contents = self.getUniqueString()
         filename = self.getUniqueString()
-        target_path = tempdir.abspath(filename)
+        target_path = abspath(tempdir, filename)
         write_file(target_path, original_contents)
         package_file = SimplePackageFile(
             filename, contents=new_contents, overwrite=False)
@@ -124,10 +125,10 @@
 
     def test_write_encodes_unicode(self):
         writer = self.get_writer()
-        tempdir = self.useFixture(TempdirFixture())
+        tempdir = self.useFixture(TempDir())
         contents = u"\x80"
         filename = self.getUniqueString()
-        target_path = tempdir.abspath(filename)
+        target_path = abspath(tempdir, filename)
         package_file = SimplePackageFile(filename, contents=contents)
         writer.write([package_file], tempdir.path)
         self.assertThat(target_path, FileContains(contents.encode('utf-8')))
 
=== modified file 'versions.cfg'
--- versions.cfg	2012-08-29 15:29:32 +0000
+++ versions.cfg	2012-09-04 15:26:25 +0000
@@ -26,7 +26,7 @@
 simplejson = 2.6.1
 testresources = 0.2.5
 testtools = 0.9.16
-treeshape = 0.2.0
+treeshape = 0.2.1
 wadllib = 1.3.1
 wsgi-intercept = 0.5.1
 z3c.recipe.scripts = 1.0.1