Merge lp:~jelmer/brz/drop-lp-mirror into lp:brz

[Jelmer Vernooij]

Fix lp-mirror tests.

Fix lp-mirror tests.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/152/

=== modified file '.travis.yml'
--- .travis.yml	2018-11-23 03:46:57 +0000
+++ .travis.yml	2018-12-19 01:35:10 +0000
@@ -20,9 +20,9 @@
   - BRZ_PLUGIN_PATH=-site:-user python -Werror -Wignore::ImportWarning -Wignore::PendingDeprecationWarning -Wignore::DeprecationWarning -Wignore::ResourceWarning ./brz selftest --parallel=fork $SELFTEST_OPTIONS
 
 install:
-  - sudo apt install python-all-dev python3-all-dev subunit
+  - sudo apt install python-all-dev python3-all-dev subunit python3-launchpadlib python-launchpadlib
   - travis_retry pip install -U setuptools
-  - travis_retry pip install -U pip coverage codecov flake8 testtools paramiko fastimport configobj cython testscenarios six docutils python-subunit dulwich $TEST_REQUIRE sphinx sphinx_epytext
+  - travis_retry pip install -U pip coverage codecov flake8 testtools paramiko fastimport configobj cython testscenarios six docutils python-subunit dulwich $TEST_REQUIRE sphinx sphinx_epytext launchpadlib
 
 after_success:
   - codecov

=== modified file 'breezy/plugins/launchpad/test_lp_api.py'
--- breezy/plugins/launchpad/test_lp_api.py	2018-07-14 19:20:20 +0000
+++ breezy/plugins/launchpad/test_lp_api.py	2018-12-19 01:35:10 +0000
@@ -81,20 +81,3 @@
         from . import lp_api
         expected_path = osutils.pathjoin(config.config_dir(), 'launchpad')
         self.assertEqual(expected_path, lp_api.get_cache_directory())
-
-
-class TestLaunchpadMirror(TestCaseWithTransport):
-    """Tests for the 'bzr lp-mirror' command."""
-
-    # Testing the lp-mirror command is quite hard, since it must talk to a
-    # Launchpad server. Here, we just test that the command exists.
-
-    _test_needs_features = [launchpadlib_feature]
-
-    def test_command_exists(self):
-        out, err = self.run_bzr(['launchpad-mirror', '--help'], retcode=0)
-        self.assertEqual('', err)
-
-    def test_alias_exists(self):
-        out, err = self.run_bzr(['lp-mirror', '--help'], retcode=0)
-        self.assertEqual('', err)

=== modified file 'byov.conf'
--- byov.conf	2018-11-18 18:31:24 +0000
+++ byov.conf	2018-12-19 01:35:10 +0000
@@ -25,7 +25,7 @@
 
 # FIXME: Arguably this should be vm.build_deps=brz but it requires either an
 # available package or at least a debian/ dir ? -- vila 2018-02-23
-brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-pip, python3-pip, python-setuptools, python3-setuptools, python-flake8, python3-flake8, python-sphinx, python3-sphinx
+brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-pip, python3-pip, python-setuptools, python3-setuptools, python-flake8, python3-flake8, python-sphinx, python3-sphinx, python-launchpadlib, python3-launchpadlib
 subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
 [brz-xenial]