Merge ~nacc/git-ubuntu:lp1734905-script-snap into git-ubuntu:master

[Nish Aravamudan]

Make jenkins happy.

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

FAILED: Continuous integration, rev:4735ab7b4ae44b778ba3b58904e5a26536996a58
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/278/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Style Check

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:00569674341bb7be0d6b66495411327517a59a64
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/295/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Style Check

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:670d8855ed35778ab5389f474cc6ddf562139e8e
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/300/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Style Check

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

review: Needs Fixing (continuous-integration)

[Nish Aravamudan (nacc)]

This will fail old CI, but will pass (hopefully) new CI:

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci-redux/10/console

[Nish Aravamudan (nacc)]

From that job:

setup: running self-test
Warning: Permanently added '192.168.122.251' (ECDSA) to the list of known hosts.
No config file found, using default configuration
pylint passed!
============================= test session starts ==============================
platform linux -- Python 3.6.3, pytest-3.1.3, py-1.5.2, pluggy-0.4.0
rootdir: /snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu, inifile:
plugins: cov-2.5.1
collected 136 items

../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/build.py ........
../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/git_repository.py ........
../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/lint.py ..........
../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/repo_builder.py ..............
../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/source_builder_test.py ............
../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/test_git_repository.py ...........................................
../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/test_importer.py ...
../../snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/versioning.py ......................................

----------- coverage: platform linux, python 3.6.3-final-0 -----------
Name Stmts Miss Cover
------------------------------------------------------------------------------------------------------
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/__init__.py 0 0 100%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/__main__.py 86 76 12%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/build.py 451 376 17%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/buildsource.py 36 25 31%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/cache.py 1 0 100%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/clone.py 75 56 25%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/dsc.py 65 45 31%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/exportorig.py 53 40 25%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/git_repository.py 1041 614 41%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/importer.py 572 492 14%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/importlocal.py 152 133 12%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/importppa.py 100 80 20%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/lint.py 366 277 24%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/logging.py 8 4 50%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/merge.py 220 193 12%
/snap/git-ubuntu/x1/lib/python3.6/site-packages/gitubuntu/queue.py 174 148 15%
/snap/git-ubuntu/x1/lib/python3.6/site-packa...

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

PASSED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/302/
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/302/rebuild

review: Approve (continuous-integration)

[Robie Basak (racb)]

review: Approve

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/303/
Executed test runs:
    FAILED: VM Setup

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/304/
Executed test runs:
    SUCCESS: VM Setup
    FAILED: Build

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/305/
Executed test runs:
    SUCCESS: VM Setup
    FAILED: Build

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/306/
Executed test runs:
    FAILED: VM Setup

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/308/
Executed test runs:
    SUCCESS: VM Setup
    FAILED: Build

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/321/
Executed test runs:
    SUCCESS: VM Setup
    FAILED: Build

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/322/
Executed test runs:
    FAILED: VM Setup

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/324/
Executed test runs:
    FAILED: VM Setup

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/325/
Executed test runs:
    FAILED: VM Setup

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:4af7a4a3c8daa5a7789f920d972ea66f52d10654
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/326/
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/326/rebuild

review: Approve (continuous-integration)

diff --git a/scripts/import-source-packages.py b/bin/import-source-packages.py
index 3acdd36..5c52948 100755
--- a/scripts/import-source-packages.py
+++ b/bin/import-source-packages.py
@@ -33,9 +33,9 @@ sys.path.insert(
     )
 )
 
-from gitubuntu.source_information import launchpad_login
 from gitubuntu.run import run
-import scriptutils
+import gitubuntu.scriptutils as scriptutils
+from gitubuntu.source_information import launchpad_login
 
 # The 'time' attribute is the publication date, as a timestamp, of the SPPHR
 # corresponding to the URL stored in the 'link' attribute.
diff --git a/scripts/source-package-walker.py b/bin/source-package-walker.py
index 50a84c2..28e2425 100755
--- a/scripts/source-package-walker.py
+++ b/bin/source-package-walker.py
@@ -17,8 +17,6 @@ import os
 import sys
 import urllib.request
 
-import scriptutils
-
 from debian.deb822 import Sources
 
 # We expect to be running from a git repository in master for this
@@ -35,6 +33,7 @@ sys.path.insert(
     )
 )
 
+import gitubuntu.scriptutils as scriptutils
 from gitubuntu.source_information import GitUbuntuSourceInformation
 
 def import_all_published_sources(
diff --git a/scripts/update-repository-alias.py b/bin/update-repository-alias.py
index a2d9fd6..5aa41da 100755
--- a/scripts/update-repository-alias.py
+++ b/bin/update-repository-alias.py
@@ -8,8 +8,6 @@ import os
 import sys
 import urllib
 
-import scriptutils
-
 # We expect to be running from a git repository in master for this
 # script, because the snap's python code is not exposed except within
 # the snap
@@ -24,6 +22,7 @@ sys.path.insert(
     )
 )
 
+import gitubuntu.scriptutils as scriptutils
 from gitubuntu.source_information import launchpad_login_auth
 
 def update_git_repository(package, dry_run, unset):
diff --git a/scripts/scriptutils.py b/gitubuntu/scriptutils.py
index 58843a2..58843a2 100644
--- a/scripts/scriptutils.py
+++ b/gitubuntu/scriptutils.py
diff --git a/setup.py b/setup.py
index ab91ab9..0fcb081 100644
--- a/setup.py
+++ b/setup.py
@@ -20,5 +20,6 @@ setup(name='gitubuntu',
         'keyrings.alt==2.2',
         'lazr.restfulclient==0.13.5',
         'pytest==3.1.3',
+        'pytest-cov==2.5.1',
     ]
 )
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2d89fad..9bf85a3 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -33,6 +33,26 @@ apps:
       command: wrappers/git-merge-changelogs
       environment:
          PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
+   self-test:
+      command: wrappers/git-ubuntu-self-test
+      environment:
+         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
+         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
+   import-source-packages:
+      command: bin/import-source-packages.py
+      environment:
+         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
+         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
+   source-package-walker:
+      command: bin/source-package-walker.py
+      environment:
+         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
+         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
+   update-repository-alias:
+      command: bin/update-repository-alias.py
+      environment:
+         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
+         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
 
 parts:
    gbp:
@@ -180,6 +200,11 @@ parts:
       build-packages:
          - libssl-dev
          - libsqlite3-dev
+         - libbz2-dev
+         - liblzma-dev
+         - libdb-dev
+         - libgdbm-dev
+         - libreadline-dev
       stage:
          - -usr/lib/python3.6/test
    ubuntutools-python2:
@@ -251,6 +276,18 @@ parts:
          - -usr/bin/xzgrep
          - -usr/bin/xzless
          - -usr/bin/xzmore
+   pylint:
+      plugin: python
+      python-version: python3
+      source: https://github.com/PyCQA/pylint/archive/pylint-1.7.2.tar.gz
+      source-type: tar
+      stage:
+         - -usr/bin/py*
+         - -usr/bin/2to3*
+         - -usr/share/*python*
+         - -usr/lib/python3.5
+         - -usr/lib/python3.6
+      after: [python3]
    git-ubuntu:
       plugin: python
       python-version: python3
@@ -308,3 +345,6 @@ parts:
       organize:
          git-reconstruct-changelog: bin/git-reconstruct-changelog
          git-merge-changelogs: bin/git-merge-changelogs
+         import-source-packages.py: bin/import-source-packages.py
+         source-package-walker.py: bin/source-package-walker.py
+         update-repository-alias.py: bin/update-repository-alias.py
diff --git a/snap/wrappers/git-ubuntu-self-test b/snap/wrappers/git-ubuntu-self-test
new file mode 100755
index 0000000..04789b4
--- /dev/null
+++ b/snap/wrappers/git-ubuntu-self-test
@@ -0,0 +1,20 @@
+#!/snap/core/current/bin/bash
+
+python3 -m pylint --ignored-modules=pygit2 -E $SNAP/lib/python3.6/site-packages/gitubuntu/
+PYLINT_RC=$?
+
+if [ $PYLINT_RC == 0 ]; then
+	echo "pylint passed!"
+fi
+
+TMPFILE=$(mktemp)
+COVERAGE_FILE=$TMPFILE python3 -m pytest -p no:cacheprovider --cov=gitubuntu $SNAP/lib/python3.6/site-packages/gitubuntu/*
+PYTEST_RC=$?
+unlink $TMPFILE
+
+if [ $PYTEST_RC == 0 ]; then
+	echo "pytest passed!"
+fi
+
+[[ $PYLINT_RC == 0 && $PYTEST_RC == 0 ]]
+