RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 07:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-detect-init: fix py3 test

Browse Source 
* in python3, None can not be compared with a str. and
  we should always set codename with a non empty str, so update
  TestCephDetectInit.test_debian so it always set a code name.
  and assert(codename and distroname) in choose_init().

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2015-12-23 14:36:39 +08:00
parent cacc38e9cc
commit 80c770e115
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ceph-detect-init/ceph_detect_init/debian/__init__.py
View File

@ -8,6 +8,7 @@ def choose_init():
Returns the name of a init system (upstart, sysvinit ...).
"""
assert(distro and codename)
if distro.lower() in ('ubuntu', 'linuxmint'):
if codename >= 'vivid':
return 'systemd'

17
src/ceph-detect-init/tests/test_all.py
View File

@ -44,15 +44,18 @@ class TestCephDetectInit(testtools.TestCase):
self.assertEqual('sysvinit', centos.choose_init())
def test_debian(self):
with mock.patch('ceph_detect_init.debian.distro',
'debian'):
with mock.patch.multiple('ceph_detect_init.debian',
distro='debian',
codename='wheezy'):
self.assertEqual('sysvinit', debian.choose_init())
with mock.patch('ceph_detect_init.debian.distro',
'ubuntu'):
with mock.patch.multiple('ceph_detect_init.debian',
distro='ubuntu',
codename='trusty'):
self.assertEqual('upstart', debian.choose_init())
with mock.patch('ceph_detect_init.debian.codename',
'vivid'):
self.assertEqual('systemd', debian.choose_init())
with mock.patch.multiple('ceph_detect_init.debian',
distro='ubuntu',
codename='vivid'):
self.assertEqual('systemd', debian.choose_init())
def test_fedora(self):
with mock.patch('ceph_detect_init.fedora.release',