~racb/git-ubuntu:test-fixes

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision 9d4b359c5b6c33b0d7825d0e636dbce862492a21

Server Team CI bot: Approve (continuous-integration) on 2018-02-23

Nish Aravamudan: Approve on 2018-02-23

Diff: 343 lines (+123/-42)

18 files modified

MANIFEST.in (+1/-0)
gitubuntu/build.py (+15/-16)
gitubuntu/changelog_tests/test_date_1 (+0/-0)
gitubuntu/changelog_tests/test_date_2 (+0/-0)
gitubuntu/changelog_tests/test_distribution (+0/-0)
gitubuntu/changelog_tests/test_distribution_source_1 (+0/-0)
gitubuntu/changelog_tests/test_distribution_source_2 (+0/-0)
gitubuntu/changelog_tests/test_distribution_source_3 (+0/-0)
gitubuntu/changelog_tests/test_distribution_source_4 (+0/-0)
gitubuntu/changelog_tests/test_utf8_error (+0/-0)
gitubuntu/changelog_tests/test_versions_1 (+0/-0)
gitubuntu/changelog_tests/test_versions_2 (+0/-0)
gitubuntu/changelog_tests/test_versions_3 (+0/-0)
gitubuntu/changelog_tests/test_versions_unknown (+0/-0)
gitubuntu/git_repository.py (+16/-15)
gitubuntu/source_builder.py (+12/-6)
gitubuntu/source_builder_test.py (+57/-5)
gitubuntu/test_util.py (+22/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

9d4b359... by Nish Aravamudan on 2018-02-22

tests: changelog test files should move to pkg_resources

In order to access the changelog files regardless of running from the
Git repository or the snap, we need to have the test files in the
package and available via pkg_resources.

This should be done for all future testing infrastructure as we add it,
as well.

089c1e0... by Robie Basak on 2018-02-23

Factor out duplicate code

Now that we have the get_spec_changelog_version test helper, use it to
eliminate duplicate code.

67aa323... by Robie Basak on 2018-02-23

source_builder: add additional tests

These are test cases that handle the failure cases fixed in the previous
commit.

586c939... by Robie Basak on 2018-02-23

source_builder: handle native and version defaults

There were a few interconnected bugs here. Non-native versions must have
a '-' in them. When specified by the caller explicitly, make sure this
is the case and raise an exception if it is not. When a version string
is created by default, make sure it matches the nativeness of the
package. The orig tarball, in the case of a non-native package, must
have the Debian revision stripped from its name.

Original fix by Nish; I have modified it substantially here.

262601c... by Nish Aravamudan on 2018-02-22

source_builder_test: version and changelog_versions are specified as strings

87b09e0... by Nish Aravamudan on 2018-02-22

source_builder: do not build a changes file

Technically this is not necessary (the DSC is sufficient) and
dpkg-buildpackage fails in the snap, due to not shipping a gcc.

Thanks to Robie Basak.

807840c... by Robie Basak on 2018-02-12

SourceSpec/SourceFiles: add changelog_versions

This allows a Source to be created with a predefined list of versions in
debian/changelog. This is useful, for example, for control of changelog
parents during testing.

f55596f... by Robie Basak on 2018-02-21

Merge branch 'source-tree' into HEAD

bb9fecb... by Robie Basak on 2018-02-21

Merge branch 'decouple-gitubunturepository' into HEAD

b7d356f... by Robie Basak on 2018-02-19

Prevent modification of GitUbuntuRepository env

Since it is common to take a GitUbuntuRepository instance env property
and then adjust it, make sure that modifying the dictionary returned
from the property getter does not modify the dictionary owned by the
instance itself. This adds some robustness against this common use
pattern.