c5a7e8f1c8
The new python3-ceph-common deb package (introduced in ceph octopus) adds a new ceph directory (a parent package in python terms) in /usr/lib/python3/dist-packages/ceph/. This results in a conflict with charm-ceph-xyz/lib/ceph/ on imports. For example, with the current import of ceph.utils in ceph-osd/hooks/ceph_hooks.py, Python finds no utils.py in /usr/lib/python3/dist-packages/ceph/ and then stops searching. Therefore, rename ceph to charms_ceph to avoid the conflict. Change-Id: I6eaf03e291f65125269b1836dd2636806f9945e1
41 lines
1.4 KiB
Python
41 lines
1.4 KiB
Python
# Copyright 2019 Canonical Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import unittest
|
|
|
|
from mock import patch
|
|
|
|
import charms_ceph.utils
|
|
|
|
|
|
class GeneralUtilsTestCase(unittest.TestCase):
|
|
def setUp(self):
|
|
super(GeneralUtilsTestCase, self).setUp()
|
|
|
|
@patch.object(charms_ceph.utils.subprocess, 'call')
|
|
def test_udevadm_settle(self, _call):
|
|
charms_ceph.utils.udevadm_settle()
|
|
_call.assert_called_once_with(['udevadm', 'settle'])
|
|
|
|
@patch.object(charms_ceph.utils, 'udevadm_settle')
|
|
@patch.object(charms_ceph.utils.subprocess, 'call')
|
|
def test_rescan_osd_devices(self, _call, _udevadm_settle):
|
|
charms_ceph.utils.rescan_osd_devices()
|
|
_call.assert_called_once_with([
|
|
'udevadm',
|
|
'trigger',
|
|
'--subsystem-match=block',
|
|
'--action=add'])
|
|
_udevadm_settle.assert_called_once_with()
|