~ubuntu-branches/debian/sid/bzr-builddeb/sid

« back to all changes in this revision

Viewing changes to tests/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij, Colin Watson, Jelmer Vernooij, Robert Collins, James Westby
  • Date: 2010-08-11 18:23:54 UTC
  • Revision ID: james.westby@ubuntu.com-20100811182354-pgqznly5bbtoiso4
Tags: 2.5
[ Colin Watson ]
* Consider a .dsc without a Format: to be Format: 1.0.

[ Jelmer Vernooij ]
* export now uses the timestamp of the last revision, making them more
  deterministic, and so hopefully producing the same tarballs when it is
  used for that.
* Fix use of getattr to have 3 arguments to avoid exception. (LP: #572093)
* Implement the automatic_tag_name hook so that "bzr tag" with no arguments
  will tag based on the version in debian/changelog.
* Support upstream/VERSION tags, for compatibility with git-
  buildpackage. LP: #551362
* Support upstream tarballs without a pristine tar delta.
* Support -r argument to import-upstream.

[ Robert Collins ]
* Add import-upstream command which imports an upstream - useful for
  migrating existing packaging branches into pristine-tar using mode.
* Stop stripping .bzrignore from tarball imports. LP: #496907
* Make the upstream branch authoritative for file ids when importing a
  tarball, stopping errors when files are renamed. LP: #588060

[ James Westby ]
* Add a --package-merge option to builddeb to build with the -v and -sa
  appropriate when doing a merge from Debian or similar. LP: #576027
* Fixed a logic error that stops -r working in merge-upstream. LP: #594575

[ Jelmer Vernooij ]
* Determine Bazaar home directory using bzrlib to prevent test
  isolation issues. Closes: #614125
* Bump standards version to 3.9.1 (no changes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
import os
29
29
from unittest import TestSuite
30
30
 
31
 
from debian_bundle.changelog import Version, Changelog
 
31
try:
 
32
    from debian.changelog import Version, Changelog
 
33
except ImportError:
 
34
    # Prior to 0.1.15 the debian module was called debian_bundle
 
35
    from debian_bundle.changelog import Version, Changelog
32
36
 
33
37
from bzrlib.tests import TestUtil, multiply_tests, TestCaseWithTransport
34
38
 
125
129
            'test_source_distiller',
126
130
            'test_upstream',
127
131
            'test_util',
 
132
            'test_tagging',
128
133
            ]
129
134
    suite.addTest(loader.loadTestsFromModuleNames(["%s.%s" % (__name__, i)
130
135
                                            for i in testmod_names]))
323
328
    def basedir(self):
324
329
        return self.name + "-" + str(self._cl.version.upstream_version)
325
330
 
 
331
    def write_debian_files(self, basedir):
 
332
        self._make_files(self.debian_files, basedir)
 
333
        self._make_files({"debian/changelog": str(self._cl)}, basedir)
 
334
 
326
335
    def _make_base(self):
327
336
        basedir = self.basedir()
328
337
        os.mkdir(basedir)
360
369
            else:
361
370
                cmd = ["dpkg-source", "--format=3.0 (native)", "-b",
362
371
                        basedir]
363
 
        self._make_files(self.debian_files, basedir)
364
 
        self._make_files({"debian/changelog": str(self._cl)}, basedir)
 
372
        self.write_debian_files(basedir)
365
373
        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
366
374
                stderr=subprocess.STDOUT)
367
375
        ret = proc.wait()