Merge ~racb/git-ubuntu:test-fixes into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

Test fixes pulled out from https://code.launchpad.net/~nacc/usd-importer/+git/usd-importer/+merge/338593 and fixed up according to my review comments there. I suggest reviewing and landing this first, then rebasing the other MP back onto origin/master, dropping the test fixes I've pulled out here.

Here are the commits from the other MP I pulled out:

a395d9d source_builder: do not build a changes file
e5dae23 source-builder: set default version correctly for non-native packages
35d0a0c source_builder_test: version and changelog_versions are specified as strings
9ab2673 tests: changelog test files should move to pkg_resources

[Nish Aravamudan (nacc)]

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:9d4b359c5b6c33b0d7825d0e636dbce862492a21
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/296/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    FAILED: Integration Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/296/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:9d4b359c5b6c33b0d7825d0e636dbce862492a21
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/297/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/297/rebuild

review: Approve (continuous-integration)

diff --git a/MANIFEST.in b/MANIFEST.in
index 0c53069..35cac97 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include gitubuntu/*.txt
 include gitubuntu/hooks/*
+graft gitubuntu/changelog_tests
diff --git a/gitubuntu/build.py b/gitubuntu/build.py
index 767a9ec..5e73794 100644
--- a/gitubuntu/build.py
+++ b/gitubuntu/build.py
@@ -48,6 +48,7 @@ from gitubuntu.source_information import (
     derive_source_from_series,
     derive_codename_from_series,
 )
+from gitubuntu.test_util import get_test_changelog
 try:
     pkg = 'python3-debian'
     from debian.debfile import PART_EXTS
@@ -716,35 +717,33 @@ def derive_source_from_changelog(changelog):
     series = changelog.distribution.split('-')[0]
     return derive_source_from_series(series)
 
[e-mail]('changelog_path, expected', [
-    ('tests/changelogs/test_distribution_source_1', 'ubuntu'),
-    ('tests/changelogs/test_distribution_source_2', 'ubuntu'),
-    ('tests/changelogs/test_distribution_source_3', 'debian'),
-    ('tests/changelogs/test_distribution_source_4', 'ubuntu'),
[e-mail]('changelog_name, expected', [
+    ('test_distribution_source_1', 'ubuntu'),
+    ('test_distribution_source_2', 'ubuntu'),
+    ('test_distribution_source_3', 'debian'),
+    ('test_distribution_source_4', 'ubuntu'),
 ])
-def test_derive_source_from_changelog(changelog_path, expected):
+def test_derive_source_from_changelog(changelog_name, expected):
     assert derive_source_from_changelog(
-        gitubuntu.git_repository.Changelog.from_path(changelog_path)
+        get_test_changelog(changelog_name),
     ) == expected
 
 def derive_codename_from_changelog(changelog):
     series = changelog.distribution.split('-')[0]
     return derive_codename_from_series(series)
 
[e-mail]('changelog_path, expected', [
-    ('tests/changelogs/test_distribution_source_1', 'xenial'),
-    ('tests/changelogs/test_distribution_source_2', 'zesty'),
-    ('tests/changelogs/test_distribution_source_3', 'sid'),
[e-mail]('changelog_name, expected', [
+    ('test_distribution_source_1', 'xenial'),
+    ('test_distribution_source_2', 'zesty'),
+    ('test_distribution_source_3', 'sid'),
 ])
-def test_derive_codename_from_changelog(changelog_path, expected):
+def test_derive_codename_from_changelog(changelog_name, expected):
     assert derive_codename_from_changelog(
-        gitubuntu.git_repository.Changelog.from_path(changelog_path)
+        get_test_changelog(changelog_name),
     ) == expected
     with pytest.raises(ValueError):
         derive_codename_from_changelog(
-            gitubuntu.git_repository.Changelog.from_path(
-                'tests/changelogs/test_distribution_source_4',
-            )
+            get_test_changelog('test_distribution_source_4'),
         )
 
 def expand_changelog_source_aliases(orig_search_list, changelog):
diff --git a/tests/changelogs/test_date_1 b/gitubuntu/changelog_tests/test_date_1
index b0e5e65..b0e5e65 100644
--- a/tests/changelogs/test_date_1
+++ b/gitubuntu/changelog_tests/test_date_1
diff --git a/tests/changelogs/test_date_2 b/gitubuntu/changelog_tests/test_date_2
index dfbd3d1..dfbd3d1 100644
--- a/tests/changelogs/test_date_2
+++ b/gitubuntu/changelog_tests/test_date_2
diff --git a/tests/changelogs/test_distribution b/gitubuntu/changelog_tests/test_distribution
index b0e5e65..b0e5e65 100644
--- a/tests/changelogs/test_distribution
+++ b/gitubuntu/changelog_tests/test_distribution
diff --git a/tests/changelogs/test_distribution_source_1 b/gitubuntu/changelog_tests/test_distribution_source_1
index b0e5e65..b0e5e65 100644
--- a/tests/changelogs/test_distribution_source_1
+++ b/gitubuntu/changelog_tests/test_distribution_source_1
diff --git a/tests/changelogs/test_distribution_source_2 b/gitubuntu/changelog_tests/test_distribution_source_2
index 96faa4e..96faa4e 100644
--- a/tests/changelogs/test_distribution_source_2
+++ b/gitubuntu/changelog_tests/test_distribution_source_2
diff --git a/tests/changelogs/test_distribution_source_3 b/gitubuntu/changelog_tests/test_distribution_source_3
index f3d7621..f3d7621 100644
--- a/tests/changelogs/test_distribution_source_3
+++ b/gitubuntu/changelog_tests/test_distribution_source_3
diff --git a/tests/changelogs/test_distribution_source_4 b/gitubuntu/changelog_tests/test_distribution_source_4
index 641a08e..641a08e 100644
--- a/tests/changelogs/test_distribution_source_4
+++ b/gitubuntu/changelog_tests/test_distribution_source_4
diff --git a/tests/changelogs/test_utf8_error b/gitubuntu/changelog_tests/test_utf8_error
index 9dd0ba5..9dd0ba5 100644
--- a/tests/changelogs/test_utf8_error
+++ b/gitubuntu/changelog_tests/test_utf8_error
diff --git a/tests/changelogs/test_versions_1 b/gitubuntu/changelog_tests/test_versions_1
index b0e5e65..b0e5e65 100644
--- a/tests/changelogs/test_versions_1
+++ b/gitubuntu/changelog_tests/test_versions_1
diff --git a/tests/changelogs/test_versions_2 b/gitubuntu/changelog_tests/test_versions_2
index 40a0fd6..40a0fd6 100644
--- a/tests/changelogs/test_versions_2
+++ b/gitubuntu/changelog_tests/test_versions_2
diff --git a/tests/changelogs/test_versions_3 b/gitubuntu/changelog_tests/test_versions_3
index fbbeee8..fbbeee8 100644
--- a/tests/changelogs/test_versions_3
+++ b/gitubuntu/changelog_tests/test_versions_3
diff --git a/tests/changelogs/test_versions_unknown b/gitubuntu/changelog_tests/test_versions_unknown
index d544e64..d544e64 100644
--- a/tests/changelogs/test_versions_unknown
+++ b/gitubuntu/changelog_tests/test_versions_unknown
diff --git a/gitubuntu/git_repository.py b/gitubuntu/git_repository.py
index d574783..1f8522d 100644
--- a/gitubuntu/git_repository.py
+++ b/gitubuntu/git_repository.py
@@ -28,6 +28,7 @@ from gitubuntu.run import (
    run_gbp,
    run_quilt,
 )
+from gitubuntu.test_util import get_test_changelog
 try:
     pkg = 'python3-debian'
     import debian.changelog
@@ -674,38 +675,38 @@ class Changelog:
             return ret
         return self._shell_srcpkg
 
[e-mail]('changelog_path, expected', [
-    ('tests/changelogs/test_versions_1', ['1.0', None]),
-    ('tests/changelogs/test_versions_2', ['2.0', '1.0']),
-    ('tests/changelogs/test_versions_3', ['4.0', '3.0']),
-    ('tests/changelogs/test_versions_unknown', ['ss-970814-1', None]),
[e-mail]('changelog_name, expected', [
+    ('test_versions_1', ['1.0', None]),
+    ('test_versions_2', ['2.0', '1.0']),
+    ('test_versions_3', ['4.0', '3.0']),
+    ('test_versions_unknown', ['ss-970814-1', None]),
 ])
-def test_changelog_versions(changelog_path, expected):
-    test_changelog = Changelog.from_path(changelog_path)
+def test_changelog_versions(changelog_name, expected):
+    test_changelog = get_test_changelog(changelog_name)
     assert [test_changelog.version, test_changelog.previous_version] == expected
 
 
[e-mail]('changelog_path, expected', [
-    ('tests/changelogs/test_versions_unknown', ['ss-970814-1',]),
[e-mail]('changelog_name, expected', [
+    ('test_versions_unknown', ['ss-970814-1',]),
 ])
-def test_changelog_all_versions(changelog_path, expected):
-    test_changelog = Changelog.from_path(changelog_path)
+def test_changelog_all_versions(changelog_name, expected):
+    test_changelog = get_test_changelog(changelog_name)
     assert test_changelog.all_versions == expected
 
 
 def test_changelog_distribution():
-    test_changelog = Changelog.from_path('tests/changelogs/test_distribution')
+    test_changelog = get_test_changelog('test_distribution')
     assert test_changelog.distribution == 'xenial'
 
 def test_changelog_date():
-    test_changelog = Changelog.from_path('tests/changelogs/test_date_1')
+    test_changelog = get_test_changelog('test_date_1')
     assert test_changelog.date == 'Mon, 12 May 2016 08:14:34 -0700'
-    test_changelog = Changelog.from_path('tests/changelogs/test_date_2')
+    test_changelog = get_test_changelog('test_date_2')
     assert test_changelog.date == 'Mon, 12 May 2016 08:14:34 -0700'
 
 
 def test_changelog_utf8():
-    test_changelog = Changelog.from_path('tests/changelogs/test_utf8_error')
+    test_changelog = get_test_changelog('test_utf8_error')
     assert test_changelog.version == '1.0.3-2'
 
 
diff --git a/gitubuntu/source_builder.py b/gitubuntu/source_builder.py
index fad1fdb..f991be3 100644
--- a/gitubuntu/source_builder.py
+++ b/gitubuntu/source_builder.py
@@ -84,6 +84,14 @@ class SourceSpec:
         for k, v in kwargs.items():
             setattr(self, k, v)
 
+        # If the version was not explicitly set, toggle the default for
+        # non-native packages
+        if 'version' not in kwargs and not self.native:
+            self.version = '1-1'
+
+        if not self.native and '-' not in self.version:
+            raise ValueError("Version must have a '-' in a non-native package")
+
 
 class SourceFiles:
     """Representation of a Debian source package in terms of its files
@@ -236,21 +244,19 @@ class Source:
             for basename, content in patches.items():
                 patch_path.join(basename).write(content)
         if not self.spec.native:
+            orig_version, _ = self.spec.version.rsplit('-', maxsplit=1)
             orig_basename = (
-                'source-builder-package_%s.orig.tar.gz' % self.spec.version
+                'source-builder-package_%s.orig.tar.gz' % orig_version
             )
             tarfile.open(str(top.join(orig_basename)), 'w:gz').close()
         subprocess.check_call(
-            ['dpkg-buildpackage', '-us', '-uc', '-S', '-nc', '-d'],
-            cwd=str(tree),
+            ['dpkg-source', '--build', tree.basename],
+            cwd=str(top),
         )
 
         for entry in top.listdir():
             if entry.basename.endswith('.dsc'):
                 self.dsc_path = str(entry)
-            elif entry.basename.endswith('.changes'):
-                self.changes_path = str(entry)
 
         assert self.dsc_path is not None
-        assert self.changes_path is not None
         return self.dsc_path
diff --git a/gitubuntu/source_builder_test.py b/gitubuntu/source_builder_test.py
index cfe1e33..4b7981a 100644
--- a/gitubuntu/source_builder_test.py
+++ b/gitubuntu/source_builder_test.py
@@ -20,20 +20,37 @@ def dsc_path_to_tree(repo, dsc_path):
     return repo.raw_repo.get(tree_hash)
 
 
+def get_spec_changelog_version(repo, **kwargs):
+    """Find the version of a source created with given SourceSpec arguments
+
+    Create a SourceSpec with the given arguments, construct a Source from that
+    spec using the source builder, and then extract and return the changelog
+    version string from the debian/changelog file created within that source.
+
+    :param GitUbuntuRepository: repository to create it in
+    :param **kwargs: arguments to pass to the SourceSpec constructor
+    :rtype: str
+    :returns: the changelog version string found in debian/changelog
+    """
+    spec = target.SourceSpec(**kwargs)
+    with target.Source(spec) as dsc_path:
+        tree_hash = importer.dsc_to_tree_hash(repo.raw_repo, dsc_path)
+        changelog = repo.get_changelog_from_treeish(tree_hash)
+        return changelog.version
+
+
 def test_source_is_created():
     with target.Source() as f:
         assert os.path.exists(f)
 
 
 def test_source_create_with_version(repo):
-    with target.Source(target.SourceSpec(version=3)) as f:
-        tree_hash = importer.dsc_to_tree_hash(repo.raw_repo, f)
-        changelog = repo.get_changelog_from_treeish(tree_hash)
-        assert changelog.version == '3'
+    version = get_spec_changelog_version(repo, version='3')
+    assert version == '3'
 
 
 def test_source_create_with_versions(repo):
-    with target.Source(target.SourceSpec(changelog_versions=[3, 4])) as f:
+    with target.Source(target.SourceSpec(changelog_versions=['3', '4'])) as f:
         tree_hash = importer.dsc_to_tree_hash(repo.raw_repo, f)
         changelog = repo.get_changelog_from_treeish(tree_hash)
         assert changelog.all_versions == ['3', '4']
@@ -73,3 +90,38 @@ def test_source_quilt_with_patches(repo):
                 top,
                 'debian/patches/%s' % basename,
             )
+
+
+def test_source_version_native_default(repo):
+    # The default version string for a native package should not have a '-' in
+    # it.
+    version = get_spec_changelog_version(repo, native=True)
+    assert '-' not in version
+
+
+def test_source_version_non_native_default(repo):
+    # The default version string for a non-native package should have a '-' in
+    # it.
+    version = get_spec_changelog_version(repo, native=False)
+    assert '-' in version
+
+
+def test_source_version_native_specific(repo):
+    # We should be able to create a native package with a native-looking
+    # version string.
+    version = get_spec_changelog_version(repo, native=True, version='1.0')
+    assert version == '1.0'
+
+
+def test_source_version_non_native_specific(repo):
+    # We should be able to create a non-native package with a non-native
+    # -looking version string.
+    version = get_spec_changelog_version(repo, native=False, version='1.0-1')
+    assert version == '1.0-1'
+
+
+def test_source_non_native_version_no_hyphen_raises(repo):
+    # Creating a non-native package with a native-looking version string should
+    # fail.
+    with pytest.raises(ValueError):
+        get_spec_changelog_version(repo, native=False, version='1')
diff --git a/gitubuntu/test_util.py b/gitubuntu/test_util.py
new file mode 100644
index 0000000..2977bfa
--- /dev/null
+++ b/gitubuntu/test_util.py
@@ -0,0 +1,22 @@
+import os
+
+import pkg_resources
+
+import gitubuntu.git_repository
+
+
+def get_test_changelog(name):
+    """Create a Changelog object from a test case pkg_resources file
+
+    Find the test case file in the source tree or shipped with the package,
+    read it into a Changelog object, and return that object.
+
+    :param str name: the name of the test case changelog file from the
+        gitubuntu/changelog_tests/ directory in the source tree.
+    :returns: the Changelog object constructed from the test case input file
+    :rtype: gitubuntu.git_repository.Changelog
+    """
+    return gitubuntu.git_repository.Changelog.from_path(os.path.join(
+        pkg_resources.resource_filename('gitubuntu', 'changelog_tests'),
+        name,
+    ))