From: root Date: Thu, 11 May 2017 07:53:09 +0000 (+0000) Subject: Test: Fix some contrast infomation in test case X-Git-Tag: v1.5.38~2^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34c5bef88b6acf955db5fc699824cc227ed8a532;p=ceph-deploy.git Test: Fix some contrast infomation in test case Maybe someone forgets to fix test info in test_install.py. E AssertionError: assert ['ceph', 'cep...d', 'radosgw'] == ['ceph-mds', '...d', 'radosgw'] E At index 0 diff: 'ceph' != 'ceph-mds' E Full diff: E - ['ceph', 'ceph-mds', 'ceph-mon', 'ceph-osd', 'radosgw'] E ? -------- E + ['ceph-mds', 'ceph-mgr', 'ceph-mon', 'ceph-osd', 'radosgw'] E ? ++++++++++++ So fix it. Signed-off-by: Yu Shengzuo --- diff --git a/ceph_deploy/tests/test_install.py b/ceph_deploy/tests/test_install.py index 2d62bac..7225f12 100644 --- a/ceph_deploy/tests/test_install.py +++ b/ceph_deploy/tests/test_install.py @@ -65,7 +65,7 @@ class TestDetectComponents(object): self.distro.is_deb = True result = sorted(install.detect_components(self.args, self.distro)) assert result == sorted([ - 'ceph-osd', 'ceph-mds', 'ceph-mgr', 'ceph-mon', 'radosgw' + 'ceph-osd', 'ceph-mds', 'ceph', 'ceph-mon', 'radosgw' ]) def test_install_all_with_other_options_returns_all_packages_deb(self): @@ -78,14 +78,14 @@ class TestDetectComponents(object): self.args.install_osd = True result = sorted(install.detect_components(self.args, self.distro)) assert result == sorted([ - 'ceph-osd', 'ceph-mds', 'ceph-mgr', 'ceph-mon', 'radosgw' + 'ceph-osd', 'ceph-mds', 'ceph', 'ceph-mon', 'radosgw' ]) def test_install_all_returns_all_packages_rpm(self): self.args.install_all = True result = sorted(install.detect_components(self.args, self.distro)) assert result == sorted([ - 'ceph-osd', 'ceph-mds', 'ceph-mgr', 'ceph-mon', 'ceph-radosgw' + 'ceph-osd', 'ceph-mds', 'ceph', 'ceph-mon', 'ceph-radosgw' ]) def test_install_all_with_other_options_returns_all_packages_rpm(self): @@ -96,7 +96,7 @@ class TestDetectComponents(object): self.args.install_osd = True result = sorted(install.detect_components(self.args, self.distro)) assert result == sorted([ - 'ceph-osd', 'ceph-mds', 'ceph-mgr', 'ceph-mon', 'ceph-radosgw' + 'ceph-osd', 'ceph-mds', 'ceph', 'ceph-mon', 'ceph-radosgw' ]) def test_install_only_one_component(self): @@ -119,5 +119,5 @@ class TestDetectComponents(object): def test_install_all_should_be_default_when_no_options_passed(self): result = sorted(install.detect_components(self.args, self.distro)) assert result == sorted([ - 'ceph-osd', 'ceph-mds', 'ceph-mgr', 'ceph-mon', 'ceph-radosgw' + 'ceph-osd', 'ceph-mds', 'ceph', 'ceph-mon', 'ceph-radosgw' ])