diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2017-04-27 08:46:18 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2017-04-27 08:50:25 +0200 |
| commit | 545f9e9cf1baa5e09f72211d6c40928953d414e3 (patch) | |
| tree | 1484832c789b06ae998cdee9220013c3934e71f0 | |
| parent | cc1ec4e7f3b395d5f25e7d4922e6359b58a2206a (diff) | |
| download | oslo-messaging-545f9e9cf1baa5e09f72211d6c40928953d414e3.tar.gz | |
tests: fix MultiStrOpt value
Last oslo.config was magically converting MultiStrOpt "messaging" to ["messaging"],
that was not expected, oslo.messaging have a test that use "messaging"
instead of a list.
This change fixes that.
This also changes the kombu requirements to make test pass.
(cherry picked from commit 4818fda46e6e6eedf5df4833a66e444ec71e6d04)
Change-Id: I65b8cc551dde6f80d979640ba3db097572f3fe9b
| -rw-r--r-- | oslo_messaging/tests/test_fixture.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oslo_messaging/tests/test_fixture.py b/oslo_messaging/tests/test_fixture.py index a8c2eb6..73b68c2 100644 --- a/oslo_messaging/tests/test_fixture.py +++ b/oslo_messaging/tests/test_fixture.py @@ -57,13 +57,13 @@ class TestConfFixture(test_utils.BaseTestCase): def test_old_notifications_config_override(self): conf = self.messaging_conf.conf conf.set_override( - "notification_driver", "messaging") + "notification_driver", ["messaging"]) conf.set_override( "notification_transport_url", "http://xyz") conf.set_override( "notification_topics", ['topic1']) - self.assertEqual("messaging", + self.assertEqual(["messaging"], conf.oslo_messaging_notifications.driver) self.assertEqual("http://xyz", conf.oslo_messaging_notifications.transport_url) diff --git a/requirements.txt b/requirements.txt index 1362d10..8961ec6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ PyYAML>=3.1.0 # MIT # rabbit driver is the default # we set the amqp version to ensure heartbeat works amqp<2.0,>=1.4.0 # LGPL -kombu!=4.0.0,>=3.0.25 # BSD +kombu<4.0.0,>=3.0.25 # BSD pika>=0.10.0 # BSD pika-pool>=0.1.3 # BSD |