diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-08 07:26:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-08 07:26:09 +0000 |
| commit | 35a45898853e0b34a94ce7d4a111891f4e10e8db (patch) | |
| tree | 4080e8e1df6f313f7c21e52aac06bd29f6fde102 /glance_store/tests | |
| parent | 2379a56546be403d1b3fc62947538c0548899871 (diff) | |
| parent | b1d0feeba4e16046c7840bd4966f31a0e7527e67 (diff) | |
| download | glance_store-35a45898853e0b34a94ce7d4a111891f4e10e8db.tar.gz | |
Merge "Rbd: Deprecate unused rados_connect_timeout"
Diffstat (limited to 'glance_store/tests')
| -rw-r--r-- | glance_store/tests/unit/test_multistore_rbd.py | 8 | ||||
| -rw-r--r-- | glance_store/tests/unit/test_rbd_store.py | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/glance_store/tests/unit/test_multistore_rbd.py b/glance_store/tests/unit/test_multistore_rbd.py index 4113e6c..5b37d0a 100644 --- a/glance_store/tests/unit/test_multistore_rbd.py +++ b/glance_store/tests/unit/test_multistore_rbd.py @@ -450,14 +450,6 @@ class TestMultiStore(base.MultiStoreBaseTest, self.assertRaises(exceptions.StoreRandomGetNotSupported, self.store.get, loc, chunk_size=1) - @mock.patch.object(MockRados.Rados, 'connect') - def test_rados_connect_timeout(self, mock_rados_connect): - socket_timeout = 1 - self.config(rados_connect_timeout=socket_timeout, group="ceph1") - self.store.configure() - with self.store.get_connection('conffile', 'rados_id'): - mock_rados_connect.assert_called_with(timeout=socket_timeout) - @mock.patch.object(MockRados.Rados, 'connect', side_effect=MockRados.Error) def test_rados_connect_error(self, _): rbd_store.rados.Error = MockRados.Error diff --git a/glance_store/tests/unit/test_rbd_store.py b/glance_store/tests/unit/test_rbd_store.py index c1c3f05..08ade51 100644 --- a/glance_store/tests/unit/test_rbd_store.py +++ b/glance_store/tests/unit/test_rbd_store.py @@ -656,14 +656,6 @@ class TestStore(base.StoreBaseTest, self.assertRaises(exceptions.StoreRandomGetNotSupported, self.store.get, loc, chunk_size=1) - @mock.patch.object(MockRados.Rados, 'connect') - def test_rados_connect_timeout(self, mock_rados_connect): - socket_timeout = 1 - self.config(rados_connect_timeout=socket_timeout) - self.store.configure() - with self.store.get_connection('conffile', 'rados_id'): - mock_rados_connect.assert_called_with(timeout=socket_timeout) - @mock.patch.object(MockRados.Rados, 'connect', side_effect=MockRados.Error) def test_rados_connect_error(self, _): rbd_store.rados.Error = MockRados.Error |