Merge ~racb/usd-importer:test-collection-hang into usd-importer:master

[Robie Basak]

Make Jenkins happy

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

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Approve (continuous-integration)

[Andreas Hasenack (ahasenack)]

+1

I got this backtrace when trying to exercise the code that uses launchpad authentication, but it happens with current master as well, so it's not something introduced by this change:

http://pastebin.ubuntu.com/26013467/

review: Approve

diff --git a/gitubuntu/source_information.py b/gitubuntu/source_information.py
index b97bc8a..9e8f172 100644
--- a/gitubuntu/source_information.py
+++ b/gitubuntu/source_information.py
@@ -16,7 +16,8 @@ try:
     from launchpadlib.launchpad import Launchpad as LP
     pkg = 'python3-ubuntutools'
     from ubuntutools.archive import UbuntuSourcePackage, DebianSourcePackage, DownloadError
-    from ubuntutools.lp.lpapicache import Launchpad, SourcePackagePublishingHistory
+    import ubuntutools.lp.lpapicache
+    from ubuntutools.lp.lpapicache import SourcePackagePublishingHistory
 except ImportError:
     logging.error('Is %s installed?', pkg)
     sys.exit(1)
@@ -37,7 +38,9 @@ def launchpad_login():
 
     _LP_LOGIN = LP.login_anonymously('git-ubuntu-importer', _lp_service,
                                      version=_lp_api_version)
-    Launchpad.login_existing(_LP_LOGIN)
+    # This is deliberately in a long form and we do not import the Launchpad
+    # object into the module namespace itself to work around LP: #1733388
+    ubuntutools.lp.lpapicache.Launchpad.login_existing(_LP_LOGIN)
 
     return _LP_LOGIN