From 7c7b13535f5d9d14697fd9536ea9bffef09ceacf Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 31 Mar 2015 15:43:31 +0200 Subject: [PATCH] Add websockets to our test suite The base classes to test websockets were added but no tests were present in the actual test suite. This patch adds the required packages, modules and imports for that to work. Change-Id: I2f3b222657555607133f7ccdb51914cf07248dc8 Partial-Implements: blueprint persistent-transport --- tests/unit/transport/websocket/__init__.py | 0 tests/unit/transport/websocket/test_v1_1.py | 25 +++++++++++++++++++ .../unit/transport/websocket/v1_1/__init__.py | 17 +++++++++++++ .../websocket/v1_1/test_queue_lifecycle.py | 5 +++- 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 tests/unit/transport/websocket/__init__.py create mode 100644 tests/unit/transport/websocket/test_v1_1.py diff --git a/tests/unit/transport/websocket/__init__.py b/tests/unit/transport/websocket/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/unit/transport/websocket/test_v1_1.py b/tests/unit/transport/websocket/test_v1_1.py new file mode 100644 index 000000000..04b7c5007 --- /dev/null +++ b/tests/unit/transport/websocket/test_v1_1.py @@ -0,0 +1,25 @@ +# Copyright (c) 2015 Red Hat, Inc. +# +# 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. + +from zaqar.tests.unit.transport.websocket import v1_1 + +# -------------------------------------------------------------------------- +# Identical or just minor variations across versions +# -------------------------------------------------------------------------- + + +# TODO(kgriffs): Having to list a separate test for each backend is +# sort of a pain; is there a better way? +class TestQueueLifecycleMongoDB(v1_1.TestQueueLifecycleMongoDB): + pass diff --git a/zaqar/tests/unit/transport/websocket/v1_1/__init__.py b/zaqar/tests/unit/transport/websocket/v1_1/__init__.py index e69de29bb..54a59390e 100644 --- a/zaqar/tests/unit/transport/websocket/v1_1/__init__.py +++ b/zaqar/tests/unit/transport/websocket/v1_1/__init__.py @@ -0,0 +1,17 @@ +# Copyright (c) 2015 Red Hat, Inc. +# +# 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. + +from zaqar.tests.unit.transport.websocket.v1_1 import test_queue_lifecycle as l + +TestQueueLifecycleMongoDB = l.TestQueueLifecycleMongoDB diff --git a/zaqar/tests/unit/transport/websocket/v1_1/test_queue_lifecycle.py b/zaqar/tests/unit/transport/websocket/v1_1/test_queue_lifecycle.py index a55bb59d8..8dafa98d3 100644 --- a/zaqar/tests/unit/transport/websocket/v1_1/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/websocket/v1_1/test_queue_lifecycle.py @@ -567,11 +567,14 @@ class QueueLifecycleBaseTest(base.V1_1Base): self.protocol.onMessage(req, False) -@testing.requires_mongodb class TestQueueLifecycleMongoDB(QueueLifecycleBaseTest): config_file = 'websocket_mongodb.conf' + @testing.requires_mongodb + def setUp(self): + super(TestQueueLifecycleMongoDB, self).setUp() + def tearDown(self): storage = self.boot.storage._storage connection = storage.connection