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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7225
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/drop-lp-mirror
Merge into: lp:brz
Diff against target: 53 lines (+3/-20)
3 files modified
.travis.yml (+2/-2)
breezy/plugins/launchpad/test_lp_api.py (+0/-17)
byov.conf (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/drop-lp-mirror
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+361111@code.launchpad.net

Commit message

Fix lp-mirror tests.

Description of the change

Fix lp-mirror tests.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
20 - BRZ_PLUGIN_PATH=-site:-user python -Werror -Wignore::ImportWarning -Wignore::PendingDeprecationWarning -Wignore::DeprecationWarning -Wignore::ResourceWarning ./brz selftest --parallel=fork $SELFTEST_OPTIONS20 - BRZ_PLUGIN_PATH=-site:-user python -Werror -Wignore::ImportWarning -Wignore::PendingDeprecationWarning -Wignore::DeprecationWarning -Wignore::ResourceWarning ./brz selftest --parallel=fork $SELFTEST_OPTIONS
2121
22install:22install:
23 - sudo apt install python-all-dev python3-all-dev subunit23 - sudo apt install python-all-dev python3-all-dev subunit python3-launchpadlib python-launchpadlib
24 - travis_retry pip install -U setuptools24 - travis_retry pip install -U setuptools
25 - travis_retry pip install -U pip coverage codecov flake8 testtools paramiko fastimport configobj cython testscenarios six docutils python-subunit dulwich $TEST_REQUIRE sphinx sphinx_epytext25 - 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
2626
27after_success:27after_success:
28 - codecov28 - codecov
2929
=== 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 @@
81 from . import lp_api81 from . import lp_api
82 expected_path = osutils.pathjoin(config.config_dir(), 'launchpad')82 expected_path = osutils.pathjoin(config.config_dir(), 'launchpad')
83 self.assertEqual(expected_path, lp_api.get_cache_directory())83 self.assertEqual(expected_path, lp_api.get_cache_directory())
84
85
86class TestLaunchpadMirror(TestCaseWithTransport):
87 """Tests for the 'bzr lp-mirror' command."""
88
89 # Testing the lp-mirror command is quite hard, since it must talk to a
90 # Launchpad server. Here, we just test that the command exists.
91
92 _test_needs_features = [launchpadlib_feature]
93
94 def test_command_exists(self):
95 out, err = self.run_bzr(['launchpad-mirror', '--help'], retcode=0)
96 self.assertEqual('', err)
97
98 def test_alias_exists(self):
99 out, err = self.run_bzr(['lp-mirror', '--help'], retcode=0)
100 self.assertEqual('', err)
10184
=== 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 @@
2525
26# FIXME: Arguably this should be vm.build_deps=brz but it requires either an26# FIXME: Arguably this should be vm.build_deps=brz but it requires either an
27# available package or at least a debian/ dir ? -- vila 2018-02-2327# available package or at least a debian/ dir ? -- vila 2018-02-23
28brz.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-sphinx28brz.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
29subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools29subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
30vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml30vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
31[brz-xenial]31[brz-xenial]

Subscribers

People subscribed via source and target branches