diff options
| author | Cyril Roelandt <cyril@redhat.com> | 2022-08-03 18:57:05 +0200 |
|---|---|---|
| committer | Cyril Roelandt <cyril@redhat.com> | 2022-08-04 15:29:28 +0200 |
| commit | b1d0feeba4e16046c7840bd4966f31a0e7527e67 (patch) | |
| tree | 615d84e22751731072a006d0276853366d418e45 /glance_store/tests | |
| parent | 6851cab51a3d5dbf018f755efee8e0e640ac12ab (diff) | |
| download | glance_store-b1d0feeba4e16046c7840bd4966f31a0e7527e67.tar.gz | |
Rbd: Deprecate unused rados_connect_timeout
This option determines the value we pass as the "timeout" argument to
rados.Rados.connect. Unfortunately, this argument is silently ignored by
librados[1].
[1] https://docs.ceph.com/en/latest/rados/api/python/#rados.Rados.connect
Closes-Bug: #1983499
Change-Id: I819df987f690c7a8c0a1153ad0e30bd5dbeb7b57
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 |