Merge ~racb/git-ubuntu:test-structure-consistency into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

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

FAILED: Continuous integration, rev:f8843744fee9b04d3150113b025d2ffc800b0db7
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/13/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    FAILED: Unit Tests

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:f8843744fee9b04d3150113b025d2ffc800b0db7
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/14/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    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/14/rebuild

review: Approve (continuous-integration)

[Nish Aravamudan (nacc)]

review: Approve

diff --git a/gitubuntu/git_repository.py b/gitubuntu/git_repository.py
index 9d2ca66..2a7d4dd 100644
--- a/gitubuntu/git_repository.py
+++ b/gitubuntu/git_repository.py
@@ -676,39 +676,6 @@ class Changelog:
             return ret
         return self._shell_srcpkg
 
[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_name, expected):
-    test_changelog = get_test_changelog(changelog_name)
-    assert [test_changelog.version, test_changelog.previous_version] == expected
-
-
[e-mail]('changelog_name, expected', [
-    ('test_versions_unknown', ['ss-970814-1',]),
-])
-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 = get_test_changelog('test_distribution')
-    assert test_changelog.distribution == 'xenial'
-
-def test_changelog_date():
-    test_changelog = get_test_changelog('test_date_1')
-    assert test_changelog.date == 'Mon, 12 May 2016 08:14:34 -0700'
-    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 = get_test_changelog('test_utf8_error')
-    assert test_changelog.version == '1.0.3-2'
 
 
 class GitUbuntuChangelogError(Exception):
diff --git a/gitubuntu/test_git_repository.py b/gitubuntu/git_repository_test.py
index 2bbb25d..8b5b692 100644
--- a/gitubuntu/test_git_repository.py
+++ b/gitubuntu/git_repository_test.py
@@ -24,6 +24,43 @@ from gitubuntu.test_fixtures import (
     repo,
     pygit2_repo,
 )
+from gitubuntu.test_util import get_test_changelog
+
+
[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_name, expected):
+    test_changelog = get_test_changelog(changelog_name)
+    assert [test_changelog.version, test_changelog.previous_version] == expected
+
+
[e-mail]('changelog_name, expected', [
+    ('test_versions_unknown', ['ss-970814-1',]),
+])
+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 = get_test_changelog('test_distribution')
+    assert test_changelog.distribution == 'xenial'
+
+
+def test_changelog_date():
+    test_changelog = get_test_changelog('test_date_1')
+    assert test_changelog.date == 'Mon, 12 May 2016 08:14:34 -0700'
+    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 = get_test_changelog('test_utf8_error')
+    assert test_changelog.version == '1.0.3-2'
 
 
 @pytest.mark.parametrize('tree_func', [
diff --git a/gitubuntu/test_importer.py b/gitubuntu/importer_test.py
index df011e3..f9537c4 100644
--- a/gitubuntu/test_importer.py
+++ b/gitubuntu/importer_test.py
@@ -9,13 +9,15 @@ import pytest
 import shutil
 import tempfile
 
+import pygit2
+
 import gitubuntu.repo_builder as repo_builder
 import gitubuntu.repo_comparator as repo_comparator
 import gitubuntu.source_builder as source_builder
 
 import gitubuntu.importer as target
 
-from gitubuntu.test_git_repository import pygit2, repo
+from gitubuntu.test_fixtures import repo
 
 
 @pytest.mark.parametrize('head_versions,expected', [