mirror of
https://github.com/ceph/ceph
synced 2025-02-21 01:47:25 +00:00
ceph-volume: dependency on python-ceph-common
Sincee5b585d15d
ceph-volume depends on python-ceph-common. This commit introduces this dependency for the ceph-osd rpm (which includes ceph-volume) and installs the dependency for tox runs. Fixes: https://tracker.ceph.com/issues/46772 Fixes:e5b585d15d
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
This commit is contained in:
parent
d3d4ca5c2f
commit
cb432fe41d
@ -693,6 +693,7 @@ Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: lvm2
|
||||
Requires: sudo
|
||||
Requires: libstoragemgmt
|
||||
Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
|
||||
%description osd
|
||||
ceph-osd is the object storage daemon for the Ceph distributed file
|
||||
system. It is responsible for storing objects on a local file system
|
||||
|
@ -223,8 +223,8 @@ class TestVolume(object):
|
||||
@pytest.mark.parametrize('dev',[
|
||||
'/dev/sdb',
|
||||
api.VolumeGroup(vg_name='foo'),
|
||||
api.Volume(lv_name='vg/no_osd', lv_tags=''),
|
||||
api.Volume(lv_name='vg/no_osd', lv_tags='ceph.osd_id=null'),
|
||||
api.Volume(lv_name='vg/no_osd', lv_tags='', lv_path='lv/path'),
|
||||
api.Volume(lv_name='vg/no_osd', lv_tags='ceph.osd_id=null', lv_path='lv/path'),
|
||||
None,
|
||||
])
|
||||
def test_is_not_ceph_device(self, dev):
|
||||
|
@ -20,6 +20,7 @@ setup(
|
||||
tests_require=[
|
||||
'pytest >=2.1.3',
|
||||
'tox',
|
||||
'ceph',
|
||||
],
|
||||
entry_points = dict(
|
||||
console_scripts = [
|
||||
|
@ -1,5 +1,5 @@
|
||||
[tox]
|
||||
envlist = py27, py35, py36
|
||||
envlist = py36, py3
|
||||
skip_missing_interpreters = true
|
||||
|
||||
[testenv]
|
||||
|
@ -1,11 +1,12 @@
|
||||
[tox]
|
||||
envlist = py27, py35, py36, flake8
|
||||
envlist = py36, py3, flake8
|
||||
skip_missing_interpreters = true
|
||||
|
||||
[testenv]
|
||||
deps=
|
||||
pytest
|
||||
mock
|
||||
install_command=./tox_install_command.sh {opts} {packages}
|
||||
commands=py.test -v {posargs:ceph_volume/tests} --ignore=ceph_volume/tests/functional
|
||||
|
||||
[testenv:flake8]
|
||||
|
3
src/ceph-volume/tox_install_command.sh
Executable file
3
src/ceph-volume/tox_install_command.sh
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
python -m pip install --editable="file://`pwd`/../python-common"
|
||||
python -m pip install $@
|
Loading…
Reference in New Issue
Block a user