summaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-30 11:02:35 +0000
committerGerrit Code Review <review@openstack.org>2013-05-30 11:02:35 +0000
commit7e2805025d86220df0678110df933745a46db178 (patch)
treea645cf653e190ba246305ba0a5bcb7faf77e1d2d /tests/unit
parent95da21822653c878973bd267eea36b9683040d6d (diff)
parent484a1df32d5854312ef31c5b488fc07fff8428c4 (diff)
downloadoslo-7e2805025d86220df0678110df933745a46db178.tar.gz
oslo-7e2805025d86220df0678110df933745a46db178.tar.xz
oslo-7e2805025d86220df0678110df933745a46db178.zip
Merge "Enable hacking H403 test"
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/rpc/test_kombu.py3
-rw-r--r--tests/unit/scheduler/fake_hosts.py10
-rw-r--r--tests/unit/test_log.py3
-rw-r--r--tests/unit/test_notifier.py3
4 files changed, 12 insertions, 7 deletions
diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index ebc29ea..a524c73 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -114,7 +114,8 @@ class RpcKombuTestCase(amqp.BaseRpcAMQPTestCase):
def test_message_ttl_on_timeout(self):
"""Test message ttl being set by request timeout. The message
- should die on the vine and never arrive."""
+ should die on the vine and never arrive.
+ """
conn = self.rpc.create_connection(FLAGS)
message = 'topic test message'
diff --git a/tests/unit/scheduler/fake_hosts.py b/tests/unit/scheduler/fake_hosts.py
index 248eb3d..b02aca4 100644
--- a/tests/unit/scheduler/fake_hosts.py
+++ b/tests/unit/scheduler/fake_hosts.py
@@ -18,10 +18,12 @@ Fakes For filters tests.
class FakeHostManager(object):
- """host1: free_ram_mb=1024-512-512=0, free_disk_gb=1024-512-512=0
- host2: free_ram_mb=2048-512=1536 free_disk_gb=2048-512=1536
- host3: free_ram_mb=4096-1024=3072 free_disk_gb=4096-1024=3072
- host4: free_ram_mb=8192 free_disk_gb=8192"""
+ """
+ host1: free_ram_mb=1024-512-512=0, free_disk_gb=1024-512-512=0
+ host2: free_ram_mb=2048-512=1536 free_disk_gb=2048-512=1536
+ host3: free_ram_mb=4096-1024=3072 free_disk_gb=4096-1024=3072
+ host4: free_ram_mb=8192 free_disk_gb=8192
+ """
def __init__(self):
self.service_states = {
diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index 301e3a8..f87a1da 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -267,7 +267,8 @@ class ExceptionLoggingTestCase(test_utils.BaseTestCase):
class FancyRecordTestCase(test_utils.BaseTestCase):
"""Test how we handle fancy record keys that are not in the
- base python logging"""
+ base python logging.
+ """
def setUp(self):
super(FancyRecordTestCase, self).setUp()
diff --git a/tests/unit/test_notifier.py b/tests/unit/test_notifier.py
index 90d811f..b762d5e 100644
--- a/tests/unit/test_notifier.py
+++ b/tests/unit/test_notifier.py
@@ -54,7 +54,8 @@ class NotifierTestCase(test_utils.BaseTestCase):
def test_verify_message_format(self):
"""A test to ensure changing the message format is prohibitively
- annoying"""
+ annoying.
+ """
def message_assert(context, message):
fields = [('publisher_id', 'publisher_id'),