From 3ecece8aadc221a863398f9011461b1f8dd6a15e Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Tue, 23 Jun 2015 23:57:08 +0000 Subject: [PATCH] Fix the description in tempest.conf.sample Ic2e5bd127c9f3a0f2807a25f29d8693baf3d65f2 of oslo.log has changed the description of use_syslog, but current tempest.conf.sample does not contain this change. As the result, the pep8 test continuously fails on the gate now. This patch fixes this description. In addition, this patch adds fake body message to NotFound in javelin test for avoiding the gate problem. These gate problems happened at the same time, so this patch contains mutiple purposes but that is necessary for fixing at the same time. Closes-Bug: #1468141 Closes-Bug: #1468149 Change-Id: Iada215718651dc153b977008b376a956247ebc5d --- etc/tempest.conf.sample | 4 ++-- tempest/tests/cmd/test_javelin.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample index 4fe7044a79..4a4328263a 100644 --- a/etc/tempest.conf.sample +++ b/etc/tempest.conf.sample @@ -39,8 +39,8 @@ # Deprecated group/name - [DEFAULT]/logdir #log_dir = -# Use syslog for logging. Existing syslog format is DEPRECATED during -# I, and changed in J to honor RFC5424. (boolean value) +# Use syslog for logging. Existing syslog format is DEPRECATED and +# will be changed later to honor RFC5424. (boolean value) #use_syslog = false # (Optional) Enables or disables syslog rfc5424 format for logging. If diff --git a/tempest/tests/cmd/test_javelin.py b/tempest/tests/cmd/test_javelin.py index a0b250e6fa..e1ca8297e3 100644 --- a/tempest/tests/cmd/test_javelin.py +++ b/tempest/tests/cmd/test_javelin.py @@ -109,7 +109,7 @@ class TestCreateResources(JavelinUnitTest): self.fake_client.identity.get_tenant_by_name.return_value = \ self.fake_object['tenant'] self.fake_client.identity.get_user_by_username.side_effect = \ - lib_exc.NotFound() + lib_exc.NotFound("user is not found") self.useFixture(mockpatch.PatchObject(javelin, "keystone_admin", return_value=self.fake_client)) @@ -126,7 +126,7 @@ class TestCreateResources(JavelinUnitTest): def test_create_user_missing_tenant(self): self.fake_client.identity.get_tenant_by_name.side_effect = \ - lib_exc.NotFound() + lib_exc.NotFound("tenant is not found") self.useFixture(mockpatch.PatchObject(javelin, "keystone_admin", return_value=self.fake_client))