Merge ~racb/git-ubuntu:self-test-diagnostics into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

This is expected to fail CI. This branch adjusts the error message on failure, so it is more useful to see CI fail than to pass to make sure it is working as expected.

If desired I could rebase it on master when the failure is fixed (hopefully with https://code.launchpad.net/~racb/usd-importer/+git/usd-importer/+merge/378155) to make sure that CI is green again before landing.

[Paride Legovini (paride)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:7084eafacf3e9dd50423985391b396e77ab1352a
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/452/
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/452//rebuild

review: Needs Fixing (continuous-integration)

[Robie Basak (racb)]

CI failed with the correct message as expected. Now rebasing against master to ensure CI remains green.

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

PASSED: Continuous integration, rev:9b8aad16c3daaa704c86c15ed462e6776d621e92
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/454/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)

diff --git a/snap-wrappers/wrappers/git-ubuntu-self-test b/snap-wrappers/wrappers/git-ubuntu-self-test
index 8934d25..fd703bf 100755
--- a/snap-wrappers/wrappers/git-ubuntu-self-test
+++ b/snap-wrappers/wrappers/git-ubuntu-self-test
@@ -30,6 +30,7 @@ if python3 -m pip check
 then
     echo "pip3 found all required dependencies"
 else
+    echo "pip check failed; self test will fail"
     retval=1
 fi
 
@@ -38,6 +39,7 @@ if python3 -m pylint --ignored-modules=pygit2,py.path -E gitubuntu/
 then
     echo "pylint passed!"
 else
+    echo "pylint failed; self test will fail"
     retval=1
 fi
 
@@ -76,7 +78,7 @@ while IFS= read -r -d '' script_source; do
 	then
             echo "PASS (compilation) ${script}"
         else
-            echo "FAIL (compilation) ${script}"
+            echo "FAIL (compilation) ${script}; self test will fail"
             retval=1
         fi
     else
@@ -89,6 +91,7 @@ if COVERAGE_FILE="${tmp_dir}/coverage.txt" python3 -m pytest -p no:cacheprovider
 then
     echo "pytest passed!"
 else
+    echo "pytest failed; self test will fail"
     retval=1
 fi