Merge lp:~jml/pkgme/remove-binary-backend into lp:pkgme

[Jonathan Lange]

This branch removes the binary backend from pkgme.

There are several reasons why this is a good idea, or at least, not a bad one.

 * As it stands in trunk, the binary backend needs a devportal-metadata.json – hardly generic
 * As it stands in lp:~jml/pkgme/improve-auto-depends, it also needs a 1.5 GB database. Any functioning implementation will need a database of similar size, or access to an external service that provides such a database
 * pkgme allows for third-party backends, so why not use that

[lp:~jml/pkgme/remove-binary-backend]

76. By Jonathan Lange on 2011-08-10

Remove data files.

[James Westby (james-w)]

review: Approve

=== removed directory 'pkgme/backends/binary'
=== removed file 'pkgme/backends/binary/build_depends'
--- pkgme/backends/binary/build_depends	2011-07-18 11:08:14 +0000
+++ pkgme/backends/binary/build_depends	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-from pkgme.binary import guess_dependencies
-
-
-def main():
-    path = os.getcwd()
-    print ', '.join(guess_dependencies(path))
-
-
-if __name__ == '__main__':
-    main()
 
=== removed file 'pkgme/backends/binary/depends'
--- pkgme/backends/binary/depends	2011-07-18 11:08:14 +0000
+++ pkgme/backends/binary/depends	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/usr/bin/python
-
-from pkgme.binary import DEPENDS
-
-
-def main():
-    print DEPENDS
-
-
-if __name__ == '__main__':
-    main()
 
=== removed file 'pkgme/backends/binary/extra_files'
--- pkgme/backends/binary/extra_files	2011-07-18 11:08:14 +0000
+++ pkgme/backends/binary/extra_files	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#!/usr/bin/python
-
-import json
-import os
-import sys
-
-from pkgme.binary import (
-    CATEGORIES,
-    get_desktop_file,
-    get_install_file,
-    METADATA_FILE,
-    PACKAGE_NAME,
-    TAGLINE,
-    )
-
-
-def main():
-    with open(METADATA_FILE) as f:
-        metadata = json.load(f)
-    package_name = metadata[PACKAGE_NAME]
-    path = os.getcwd()
-    install_file = get_install_file(package_name, path, True)
-    desktop_file = get_desktop_file(
-        package_name, path,
-        tagline=metadata.get(TAGLINE, ''),
-        categories=metadata.get(CATEGORIES, ''))
-    json.dump(
-        {
-            # XXX: Hardcoded literal attack!
-            'debian/install': install_file,
-            'debian/%s.desktop' % (package_name,): desktop_file.get_contents(),
-        }, sys.stdout)
-
-
-if __name__ == '__main__':
-    main()
 
=== removed file 'pkgme/backends/binary/package_name'
--- pkgme/backends/binary/package_name	2011-07-18 11:08:14 +0000
+++ pkgme/backends/binary/package_name	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#!/usr/bin/python
-
-import json
-from pkgme.binary import (
-    METADATA_FILE,
-    PACKAGE_NAME,
-    )
-
-
-def main():
-    with open(METADATA_FILE) as f:
-        metadata = json.load(f)
-    print metadata[PACKAGE_NAME]
-
-
-if __name__ == '__main__':
-    main()
 
=== removed file 'pkgme/backends/binary/want'
--- pkgme/backends/binary/want	2011-07-13 13:18:03 +0000
+++ pkgme/backends/binary/want	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-from pkgme.binary import METADATA_FILE
-
-def main():
-    if os.path.exists(METADATA_FILE):
-        print 10
-    else:
-        print 0
-
-
-if __name__ == '__main__':
-    main()
 
=== removed file 'pkgme/binary.py'
--- pkgme/binary.py	2011-07-15 16:30:18 +0000
+++ pkgme/binary.py	1970-01-01 00:00:00 +0000
@@ -1,249 +0,0 @@
-"""Things to help package binary tarballs.
-
-HIGHLY EXPERIMENTAL. USE AT YOUR OWN PERIL.
-
-At the moment, we are assuming a great many things about these binary
-tarballs.
-
-* That they represent some sort of application to be run from an Ubuntu
-  desktop
-
-* Specifically, that although they might have many executables, only one is
-  the "main executable" mentioned in the 'desktop' file
-
-* They are written in C or C++ and that all dependencies can be determined
-  by inspecting the included object files
-
-* That the entire contents of the tarball can be copied into
-  /opt/<package-name> and run from there
-
-* That we have a metadata file, called 'devportal-metadata.json', in JSON,
-  that specifies:
-  * package_name
-
-The expectation is that this metadata file is generated from the developer
-portal.
-"""
-
-# XXX: No idea about architecture
-
-__all__ = [
-    'get_install_file',
-    'guess_executable',
-    'iter_executables',
-    'METADATA_FILE',
-   ]
-
-
-import os
-import subprocess
-
-from pkgme.info_elements import (
-    ApplicationName,
-    Categories,
-    Executable,
-    PackageName,
-    TagLine,
-    )
-from pkgme.package_files import (
-    DEBIAN_DIR,
-    Desktop,
-    )
-from pkgme.project_info import DictInfo
-
-
-METADATA_FILE = 'devportal-metadata.json'
-
-# Keys found in the metadata file.
-CATEGORIES = 'categories'
-# It's called package_name in the database, so this probably makes sense.
-PACKAGE_NAME = 'package_name'
-TAGLINE = 'tagline'
-
-
-# Always depend on these.
-#
-# XXX: jml just doing this because iamfuzz does. Need to either experiment or
-# consult expert.
-DEPENDS = '${shlibs:Depends}, ${misc:Depends}'
-
-# XXX: No idea about how icons will be there. Ignoring for now.
-
-def guess_executable(package_name, executables):
-    """
-    From a list of executables, guess which one is likely to be the main
-    executable.
-    """
-
-    # The lower the score, the more likely it is to be the right executable.
-
-    def score_name(name):
-        # Names that match exactly are good.
-        return -int(name.lower() == package_name.lower())
-
-    def score_path(executable):
-        # The deeper the path, the less likely it is to be the one.
-        return executable.count('/')
-
-    def rank(executable):
-        name = os.path.basename(executable)
-        # The alpha-sorting of the base name is a tie-breaker.
-        return score_name(name), score_path(executable), name
-
-    try:
-        return sorted(executables, key=rank)[0]
-    except IndexError:
-        return None
-
-
-def iter_executables(path):
-    """Iterate through all executable files under 'path'.
-
-    Paths yielded will be relative to 'path'. Directories will *not* be
-    yielded. "Executable" is determined by filesystem permissions.
-    """
-    for root, dirs, files in os.walk(path):
-        for filename in files:
-            file_path = os.path.join(root, filename)
-            if os.access(file_path, os.X_OK):
-                yield os.path.relpath(file_path, path)
-
-
-def get_install_file(package_name, path, include_desktop=False):
-    """Generate the install file for 'package_name'."""
-    lines = []
-    # Sorting not actually needed for functionality, but makes the tests more
-    # reliable.
-    for filename in sorted(os.listdir(path)):
-        if filename in (DEBIAN_DIR, METADATA_FILE):
-            # We don't want to install the 'debian/' directory or the metadata
-            # file.
-            continue
-        lines.append('%s opt/%s' % (filename, package_name))
-    if include_desktop:
-        lines.append(
-            'debian/%s.desktop usr/share/application' % (package_name,))
-    # Ending the file with a newline is basic good manners.
-    lines.append('')
-    return '\n'.join(lines)
-
-
-def get_desktop_file(package_name, path, tagline=None, categories=None):
-    executable = guess_executable(package_name, iter_executables(path))
-    info = {
-        PackageName.name: package_name,
-        ApplicationName.name: package_name.capitalize(),
-        Executable.name: '/opt/%s/%s' % (package_name, executable),
-        TagLine.name: tagline,
-        Categories.name: categories,
-        }
-    return Desktop.from_info(DictInfo(info))
-
-
-def get_file_type(path):
-    return get_file_types([path])[0]
-
-
-def get_file_types(paths):
-    paths = list(paths)
-    if not paths:
-        return []
-    cmd = ['file', '-b'] + paths
-    return subprocess.Popen(
-        cmd, stdout=subprocess.PIPE).communicate()[0].splitlines()
-
-
-def ldd(binary_paths):
-    # ldd has output of the form:
-    #
-    # path/to/elf/object:
-    #    linux-vdso.so.1 =>  (0x00007fff4a7ff000)
-    #    libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f7472623000)
-    #    /lib64/ld-linux-x86-64.so.2 (0x00007f74729e5000)
-    #
-    # i.e.
-    #    <name> => <path> (<address>)
-    #
-    # where <name> and <path> are both optional. If <name> is not given, then
-    # there is no arrow (=>).
-    binary_paths = list(binary_paths)
-    if not binary_paths:
-        return {}
-    cmd = ['ldd'] + binary_paths
-    output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
-    libraries = {}
-    current = []
-    if len(binary_paths) == 1:
-        libraries[binary_paths[0]] = current
-    for line in output.splitlines():
-        if line.endswith(':'):
-            current.sort()
-            current = libraries[line.strip(':')] = []
-            continue
-        # Last token is always irrelevant hex address.
-        tokens = line.split()[:-1]
-        name, path = None, None
-        if '=>' in tokens:
-            name = tokens[0]
-            if len(tokens) > 2:
-                path = tokens[2]
-        else:
-            path = tokens[0]
-        current.append((name, path))
-    current.sort()
-    return libraries
-
-
-def get_shared_library_dependencies(paths):
-    # XXX: Not sure which of these is more useful. Specifically, if the
-    # library isn't installed on the system, then I don't know whether it will
-    # appear in ldd as the library_path. -- jml
-    libraries = ldd(paths)
-    for libs in libraries.values():
-        for name, library_path in libs:
-            if library_path:
-                yield library_path
-
-
-def find_shared_library_dependencies(path):
-    return set(get_shared_library_dependencies(iter_binaries(path)))
-
-
-def iter_binaries(path):
-
-    def is_binary(file_type):
-        return file_type.startswith('ELF')
-
-    for root, dirs, files in os.walk(path):
-        paths = [os.path.join(root, filename) for filename in files]
-        types = get_file_types(paths)
-        for file_path, file_type in zip(paths, types):
-            if is_binary(file_type):
-                yield file_path
-
-
-def apt_file(filename):
-    # XXX: Assumes apt-file update has been run.
-
-    # XXX: Passing the full file name since it seems the least likely to yield
-    # multiple dependencies.  If 'get_shared_library_dependencies' ought to
-    # return just the names, then this will have to change to be a regex, and
-    # we'll need to think about ambiguity resolution much sooner.
-    # cmd = ['apt-file', 'find', '-x', '/%s$' % (filename,)]
-
-    # XXX: Currently matching badly due to architecture.
-    cmd = ['apt-file', 'find', '-F', filename]
-    output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
-    for line in output.splitlines():
-        yield line.split(': ')[0]
-
-
-def guess_dependencies(path):
-    deps = set()
-    # XXX: ldd probably is recursive. This means it finds *all* the libraries
-    # that are needed. However, we only need to specify the top-level
-    # libraries (e.g. libc6 should almost never be a dependency).
-    for library in find_shared_library_dependencies(path):
-        for dep in apt_file(library):
-            deps.add(dep)
-    return deps
 
=== modified file 'pkgme/tests/__init__.py'
--- pkgme/tests/__init__.py	2011-08-01 16:48:11 +0000
+++ pkgme/tests/__init__.py	2011-08-10 12:24:37 +0000
@@ -7,8 +7,6 @@
 def test_suite():
     module_names = [
         'pkgme.tests.test_backend',
-        'pkgme.tests.test_binary',
-        'pkgme.tests.test_binary_backend',
         'pkgme.tests.test_distutils_command',
         'pkgme.tests.test_info_elements',
         'pkgme.tests.test_package_files',
 
=== removed file 'pkgme/tests/foo.data'
 Binary files pkgme/tests/foo.data	2011-07-15 16:26:43 +0000 and pkgme/tests/foo.data	1970-01-01 00:00:00 +0000 differ
=== removed file 'pkgme/tests/hello'
 Binary files pkgme/tests/hello	2011-07-15 09:49:16 +0000 and pkgme/tests/hello	1970-01-01 00:00:00 +0000 differ
=== removed file 'pkgme/tests/simple.so.1'
 Binary files pkgme/tests/simple.so.1	2011-07-15 09:49:16 +0000 and pkgme/tests/simple.so.1	1970-01-01 00:00:00 +0000 differ
=== removed file 'pkgme/tests/test_binary.py'
--- pkgme/tests/test_binary.py	2011-07-15 16:30:18 +0000
+++ pkgme/tests/test_binary.py	1970-01-01 00:00:00 +0000
@@ -1,339 +0,0 @@
-import os
-
-from fixtures import TestWithFixtures
-from testtools import TestCase
-from testtools.matchers import StartsWith
-
-from pkgme.binary import (
-    apt_file,
-    find_shared_library_dependencies,
-    get_desktop_file,
-    get_file_type,
-    get_file_types,
-    get_install_file,
-    get_shared_library_dependencies,
-    guess_dependencies,
-    guess_executable,
-    iter_binaries,
-    iter_executables,
-    ldd,
-    METADATA_FILE,
-    )
-from pkgme.package_files import DEBIAN_DIR
-from pkgme.testing import (
-    AreDesktopValuesFor,
-    TempdirFixture,
-    )
-
-
-class BinaryTests(TestCase, TestWithFixtures):
-
-    def test_metadata_file(self):
-        self.assertEqual('devportal-metadata.json', METADATA_FILE)
-
-
-class InstallFileTests(TestCase, TestWithFixtures):
-
-    def test_install_file(self):
-        # The install file instructs debhelper to copy everything in the
-        # top-level to /opt/<package-name>.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file')
-        install_file = get_install_file('package-name', tempdir.path)
-        self.assertEqual("some-file opt/package-name\n", install_file)
-
-    def test_install_file_many_files_and_directories(self):
-        # The install file instructs debhelper to copy everything in the
-        # top-level to /opt/<package-name>.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file')
-        tempdir.mkdir('directory')
-        install_file = get_install_file('package-name', tempdir.path)
-        self.assertEqual(
-            "directory opt/package-name\n"
-            "some-file opt/package-name\n",
-            install_file)
-
-    def test_skip_debian(self):
-        # The install file instructs debhelper to copy everything in the
-        # top-level to /opt/<package-name>, except for the 'debian' directory.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file')
-        tempdir.mkdir('directory')
-        tempdir.mkdir(DEBIAN_DIR)
-        install_file = get_install_file('package-name', tempdir.path)
-        self.assertEqual(
-            "directory opt/package-name\n"
-            "some-file opt/package-name\n",
-            install_file)
-
-    def test_skip_metadata(self):
-        # The install file instructs debhelper to copy everything in the
-        # top-level to /opt/<package-name>, except for the 'debian' directory
-        # and the metadata file.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file')
-        tempdir.mkdir('directory')
-        tempdir.touch(METADATA_FILE)
-        install_file = get_install_file('package-name', tempdir.path)
-        self.assertEqual(
-            "directory opt/package-name\n"
-            "some-file opt/package-name\n",
-            install_file)
-
-    def test_include_desktop_file(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file')
-        install_file = get_install_file(
-            'package-name', tempdir.path, include_desktop=True)
-        self.assertEqual(
-            "some-file opt/package-name\n"
-            "debian/package-name.desktop usr/share/application\n",
-            install_file)
-
-
-class DesktopFileTests(TestCase):
-
-    def test_executable_is_best_guess(self):
-        package_name = self.getUniqueString()
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.mkdir('whatever')
-        tempdir.touch('whatever/not-the-best', 0755)
-        tempdir.touch('the-best', 0755)
-        desktop_file = get_desktop_file(package_name, tempdir.path)
-        self.assertThat(
-            {'Exec': '/opt/%s/the-best' % (package_name,)},
-            AreDesktopValuesFor(desktop_file))
-
-    def test_app_name_is_capitalized_package_name(self):
-        # We don't have any information on the package name, so try to guess
-        # the application name.
-        tempdir = self.useFixture(TempdirFixture())
-        package_name = self.getUniqueString()
-        desktop_file = get_desktop_file(package_name, tempdir.path)
-        self.assertThat(
-            {'Name': package_name.capitalize()},
-            AreDesktopValuesFor(desktop_file))
-
-    def test_category_and_tagline_are_specified(self):
-        # We just pass the category and comment through.
-        tempdir = self.useFixture(TempdirFixture())
-        package_name = self.getUniqueString()
-        tagline = self.getUniqueString()
-        categories = self.getUniqueString()
-        desktop_file = get_desktop_file(
-            package_name, tempdir.path, tagline=tagline, categories=categories)
-        self.assertThat(
-            {'Comment': tagline, 'Categories': categories},
-            AreDesktopValuesFor(desktop_file))
-
-
-class FindExecutableTests(TestCase, TestWithFixtures):
-
-    def test_only_one_file_and_it_is_executable(self):
-        # If there is only one file and it's executable, find that.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file', mode=0755)
-        executables = list(iter_executables(tempdir.path))
-        self.assertEqual(['some-file'], executables)
-
-    def test_no_files_at_all(self):
-        # iter_executables finds no executables if there are no files at all.
-        tempdir = self.useFixture(TempdirFixture())
-        executables = list(iter_executables(tempdir.path))
-        self.assertEqual([], executables)
-
-    def test_no_executable_files(self):
-        # If there are no executable files, iter_executables returns None.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file', mode=0644)
-        executables = list(iter_executables(tempdir.path))
-        self.assertEqual([], executables)
-
-    def test_directory_is_not_executable_file(self):
-        # A directory does not count as an executable file.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.mkdir('directory')
-        executables = list(iter_executables(tempdir.path))
-        self.assertEqual([], executables)
-
-    def test_finds_executable_in_nested_directory(self):
-        # Even if the file is in some nested directory, we are able to find
-        # it.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.mkdir('directory')
-        tempdir.touch('directory/my-executable', mode=0755)
-        executables = list(iter_executables(tempdir.path))
-        self.assertEqual(['directory/my-executable'], executables)
-
-    def test_multiple_executables(self):
-        # If there are many executables, iter_executables finds them all.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch('some-file', mode=0755)
-        tempdir.touch('another-file', mode=0755)
-        executables = sorted(list(iter_executables(tempdir.path)))
-        self.assertEqual(['another-file', 'some-file'], executables)
-
-
-class GuessExecutableTests(TestCase):
-
-    def test_no_executables(self):
-        # If there are no executables to select from, then return None,
-        # indicating the fact.
-        executable = guess_executable('package-name', iter([]))
-        self.assertIs(None, executable)
-
-    def test_only_one_executable(self):
-        # If there's only one executable, then return that, since it's
-        # probably the main executable for the package.
-        executable = guess_executable('package-name', ['whatever'])
-        self.assertEqual('whatever', executable)
-
-    def test_exact_package_name_match(self):
-        # If there are many executables, but one of them has the same name as
-        # the package, then that is probably the main executable.
-        executable = guess_executable(
-            'package-name', ['whatever', 'package-name'])
-        self.assertEqual('package-name', executable)
-
-    def test_exact_package_name_match_in_subdir(self):
-        # If there are many executables, but one of them has the same name as
-        # the package, then that is probably the main executable, even if it
-        # is in a sub-directory.
-        executable = guess_executable(
-            'package-name', ['whatever', 'subdir/package-name', 'foo'])
-        self.assertEqual('subdir/package-name', executable)
-
-    def test_multiple_exact_matches(self):
-        # If there are many executables that have the same name as the
-        # package, then the one that is the least nested is our best guess.
-        executable = guess_executable(
-            'package-name', [
-                'whatever', 'a/b/c/d/e/subdir/package-name', 'foo',
-                'subdir/package-name'])
-        self.assertEqual('subdir/package-name', executable)
-
-    def test_different_case_match(self):
-        # If one of the executables has the same name as the package, but
-        # spelled with different case, then that is our best guess.
-        executable = guess_executable(
-            'packagename', [
-                'whatever', 'a/b/c/d/e/subdir/packagename', 'foo',
-                'subdir/PackageName'])
-        self.assertEqual('subdir/PackageName', executable)
-
-    def test_many_executables(self):
-        # If there are many executables, and their names have no particular
-        # relationship to the package name, then just pick the top-most
-        # one. If there's more than one, take the alphabetically sorted.
-        executable = guess_executable(
-            'package-name', ['dir/x', 'dir/sub/y', 'z', 'a'])
-        self.assertEqual('a', executable)
-
-
-class GetFileTypeTests(TestCase):
-
-    def test_plain_text(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file('foo.txt', 'boring content\n')
-        file_type = get_file_type(tempdir.abspath('foo.txt'))
-        self.assertEqual('ASCII text', file_type)
-
-    def test_data(self):
-        file_type = get_file_type(
-            os.path.join(os.path.dirname(__file__), 'foo.data'))
-        self.assertEqual('data', file_type)
-
-    def test_elf_binary(self):
-        binary_path = os.path.join(os.path.dirname(__file__), 'hello')
-        file_type = get_file_type(binary_path)
-        self.assertThat(file_type, StartsWith('ELF'))
-
-    def test_elf_library(self):
-        binary_path = os.path.join(os.path.dirname(__file__), 'simple.so.1')
-        file_type = get_file_type(binary_path)
-        self.assertThat(file_type, StartsWith('ELF'))
-
-    def test_multiple(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file('foo.txt', 'boring content\n')
-        file_types = get_file_types(
-            [tempdir.abspath('foo.txt'),
-             os.path.join(os.path.dirname(__file__), 'foo.data')])
-        self.assertEqual(['ASCII text', 'data'], file_types)
-
-    def test_no_files_given(self):
-        self.assertEqual([], get_file_types([]))
-        self.assertEqual([], get_file_types(iter([])))
-
-
-class IterBinariesTests(TestCase):
-
-    def test_no_binaries(self):
-        tempdir = self.useFixture(TempdirFixture())
-        self.assertEqual([], list(iter_binaries(tempdir.path)))
-
-    def test_some_binaries(self):
-        path = os.path.dirname(os.path.dirname(__file__))
-        binaries = sorted(iter_binaries(path))
-        self.assertEqual(
-            [os.path.join(os.path.dirname(__file__), 'hello'),
-             os.path.join(os.path.dirname(__file__), 'simple.so.1')],
-            binaries)
-
-
-class GetSharedLibraryDependenciesTests(TestCase):
-
-    def test_ldd_none(self):
-        deps = ldd([])
-        self.assertEqual({}, deps)
-
-    def test_ldd(self):
-        hello = os.path.join(os.path.dirname(__file__), 'hello')
-        deps = ldd([hello])
-        self.assertEqual(
-            {hello: [(None, '/lib64/ld-linux-x86-64.so.2'),
-                     ('libc.so.6', '/lib/x86_64-linux-gnu/libc.so.6'),
-                     ('linux-vdso.so.1', None)]},
-            deps)
-
-    def test_ldd_multiple(self):
-        hello = os.path.join(os.path.dirname(__file__), 'hello')
-        simple = os.path.join(os.path.dirname(__file__), 'simple.so.1')
-        deps = ldd([hello, simple])
-        self.assertEqual(
-            {hello: [(None, '/lib64/ld-linux-x86-64.so.2'),
-                     ('libc.so.6', '/lib/x86_64-linux-gnu/libc.so.6'),
-                     ('linux-vdso.so.1', None)],
-             simple: [(None, '/lib64/ld-linux-x86-64.so.2'),
-                     ('libc.so.6', '/lib/x86_64-linux-gnu/libc.so.6'),
-                     ('linux-vdso.so.1', None)]},
-            deps)
-
-    def test_get_shared_library_dependencies(self):
-        hello = os.path.join(os.path.dirname(__file__), 'hello')
-        deps = sorted(get_shared_library_dependencies([hello]))
-        self.assertEqual(
-            ['/lib/x86_64-linux-gnu/libc.so.6',
-             '/lib64/ld-linux-x86-64.so.2',
-             ], deps)
-
-    def test_find_shared_library_dependencies(self):
-        deps = find_shared_library_dependencies(os.path.dirname(__file__))
-        self.assertEqual(
-            set(['/lib/x86_64-linux-gnu/libc.so.6',
-                 '/lib64/ld-linux-x86-64.so.2']), deps)
-
-
-class AptFileTests(TestCase):
-
-    def test_full_file(self):
-        packages = list(apt_file('/usr/lib32/libasound.so.2'))
-        self.assertEqual(['lib32asound2'], packages)
-
-
-class GuessDependenciesTests(TestCase):
-
-    def test_guess_dependencies(self):
-        deps = guess_dependencies(os.path.dirname(__file__))
-        self.assertEqual(set(['libc6']), deps)
 
=== removed file 'pkgme/tests/test_binary_backend.py'
--- pkgme/tests/test_binary_backend.py	2011-07-18 11:08:14 +0000
+++ pkgme/tests/test_binary_backend.py	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-import json
-import os
-import shutil
-
-from fixtures import TestWithFixtures
-from testtools import TestCase
-
-from pkgme.backend import ExternalHelpersBackend, get_backend_dir
-from pkgme.binary import (
-    CATEGORIES,
-    DEPENDS,
-    get_desktop_file,
-    get_install_file,
-    guess_dependencies,
-    METADATA_FILE,
-    PACKAGE_NAME,
-    TAGLINE,
-    )
-from pkgme.info_elements import (
-    BuildDepends,
-    Depends,
-    ExtraFiles,
-    PackageName,
-    )
-from pkgme.testing import TempdirFixture
-
-
-BACKEND_NAME = 'binary'
-
-backend_dir = get_backend_dir(__file__, BACKEND_NAME)
-
-
-class BinaryBackendTests(TestCase, TestWithFixtures):
-
-    def test_want_with_metadata(self):
-        # If we detect a binary, then we score 10. The way we determine if
-        # something is a binary is if it has a devportal-metadata.json in its
-        # top-level.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.touch(METADATA_FILE)
-        backend = ExternalHelpersBackend(BACKEND_NAME, backend_dir)
-        self.assertEqual(10, backend.want(tempdir.path))
-
-    def test_want_without_metadata(self):
-        # If we do *not* detect a binary, then we score 0. The way we
-        # determine if something is a binary is if it has a
-        # devportal-metadata.json in its top-level.
-        tempdir = self.useFixture(TempdirFixture())
-        backend = ExternalHelpersBackend(BACKEND_NAME, backend_dir)
-        self.assertEqual(0, backend.want(tempdir.path))
-
-    def test_package_name(self):
-        # The binary backend gets the package name from the metadata file.
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file(METADATA_FILE, json.dumps({PACKAGE_NAME: 'foo'}))
-        backend = ExternalHelpersBackend(BACKEND_NAME, backend_dir)
-        info = backend.get_info(tempdir.path)
-        self.assertEqual(
-            {PackageName.name: "foo"}, info.get_all([PackageName.name]))
-
-    def test_build_depends(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file(METADATA_FILE, json.dumps({PACKAGE_NAME: 'foo'}))
-        shutil.copy(
-            os.path.join(os.path.dirname(__file__), 'hello'),
-            tempdir.path)
-        backend = ExternalHelpersBackend(BACKEND_NAME, backend_dir)
-        info = backend.get_info(tempdir.path)
-        deps = ', '.join(guess_dependencies(tempdir.path))
-        self.assertEqual(
-            {BuildDepends.name: deps}, info.get_all([BuildDepends.name]))
-
-    def test_depends(self):
-        tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file(METADATA_FILE, json.dumps({PACKAGE_NAME: 'foo'}))
-        backend = ExternalHelpersBackend(BACKEND_NAME, backend_dir)
-        info = backend.get_info(tempdir.path)
-        self.assertEqual({Depends.name: DEPENDS}, info.get_all([Depends.name]))
-
-    def test_extra_files_install_file(self):
-        # We create an 'install' file that tells debhelper to just copy
-        # everything to opt.
-        tempdir = self.useFixture(TempdirFixture())
-        package_name = self.getUniqueString()
-        tempdir.create_file(METADATA_FILE, json.dumps({PACKAGE_NAME: package_name}))
-        backend = ExternalHelpersBackend(BACKEND_NAME, backend_dir)
-        info = backend.get_info(tempdir.path)
-        extra_files = info.get_all([ExtraFiles.name])[ExtraFiles.name]
-        install_file = json.loads(extra_files)['debian/install']
-        self.assertEqual(
-            get_install_file(package_name, tempdir.path, True),
-            install_file)
-
-    def test_extra_files_desktop_file(self):
-        # We create an 'install' file that tells debhelper to just copy
-        # everything to opt.
-        tempdir = self.useFixture(TempdirFixture())
-        package_name = self.getUniqueString()
-        tagline = self.getUniqueString()
-        categories = self.getUniqueString()
-        metadata = {
-            PACKAGE_NAME: package_name,
-            TAGLINE: tagline,
-            CATEGORIES: categories,
-            }
-        tempdir.create_file(METADATA_FILE, json.dumps(metadata))
-        # We need to create an executable in order to be able to generate a
-        # desktop.
-        tempdir.touch('executable', 0755)
-        expected_desktop_file = get_desktop_file(
-            package_name, tempdir.path, tagline=tagline,
-            categories=categories).get_contents()
-        backend = ExternalHelpersBackend(BACKEND_NAME, backend_dir)
-        info = backend.get_info(tempdir.path)
-        extra_files = info.get_all([ExtraFiles.name])[ExtraFiles.name]
-        desktop = json.loads(extra_files)['debian/%s.desktop' % (package_name,)]
-        self.assertEqual(expected_desktop_file, desktop)