fixed several pep8 issues

* E127 continuation line over-indented for visual indent
  * E128 continuation line under-indented for visual indent
  * E501 line too long (82 > 79 characters)
  * W292 no newline at end of file

Tested with pep8 version 1.5.6 (2014-04-14).

Change-Id: Ibd4d9ee9635f2032831e12d32f40bebf5a67e627
This commit is contained in:
Christian Berendt 2014-05-14 11:23:04 +02:00
parent ef970b4424
commit 65ef7fb2e7
7 changed files with 45 additions and 37 deletions

View File

@ -69,22 +69,24 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest):
fail_msg = "Creation metrics failed."
statistic_meter_resp = self.verify(600, self.wait_for_instance_metrics, 3,
fail_msg,
"metrics created",
self.meter_name)
statistic_meter_resp = self.verify(
600, self.wait_for_instance_metrics, 3,
fail_msg, "metrics created", self.meter_name
)
fail_msg = "Creation alarm failed."
threshold = statistic_meter_resp[0].avg - 1
create_alarm_resp = self.verify(5, self.create_alarm,
4, fail_msg, "alarm_create",
meter_name=self.meter_name,
threshold=threshold,
name=self.name,
period=self.period,
statistic=self.statistic,
comparison_operator=self.comparison_operator)
create_alarm_resp = self.verify(
5, self.create_alarm,
4, fail_msg, "alarm_create",
meter_name=self.meter_name,
threshold=threshold,
name=self.name,
period=self.period,
statistic=self.statistic,
comparison_operator=self.comparison_operator
)
fail_msg = "Alarm verify state failed."

View File

@ -64,14 +64,16 @@ class CeilometerApiSmokeTests(ceilometermanager.CeilometerBaseTest):
fail_msg = "Creation alarm failed."
create_alarm_resp = self.verify(100, self.create_alarm,
2, fail_msg, "alarm_create",
meter_name=self.meter_name,
threshold=self.threshold,
name=self.name,
period=self.period,
statistic=self.statistic,
comparison_operator=self.comparison_operator)
create_alarm_resp = self.verify(
100, self.create_alarm,
2, fail_msg, "alarm_create",
meter_name=self.meter_name,
threshold=self.threshold,
name=self.name,
period=self.period,
statistic=self.statistic,
comparison_operator=self.comparison_operator
)
fail_msg = "Alarm list unavailable"

View File

@ -103,24 +103,24 @@ class MuranoDeploymentSmokeTests(murano.MuranoTest):
fail_msg = "User can't create service. "
self.verify(5, self.create_service,
3, fail_msg, "service creating",
self.environment.id, session.id, post_body)
3, fail_msg, "service creating",
self.environment.id, session.id, post_body)
fail_msg = "User can't deploy session. "
self.verify(5, self.deploy_session,
4, fail_msg,
"sending session on deployment",
self.environment.id, session.id)
4, fail_msg,
"sending session on deployment",
self.environment.id, session.id)
fail_msg = "Deployment was not completed correctly. "
self.verify(1800, self.deploy_check,
5, fail_msg, 'deployment is going',
self.environment.id)
5, fail_msg, 'deployment is going',
self.environment.id)
self.verify(5, self.deployments_status_check,
6, fail_msg,
'Check deployments status',
self.environment.id)
6, fail_msg,
'Check deployments status',
self.environment.id)
fail_msg = "Can't delete environment. "
self.verify(5, self.delete_environment,

View File

@ -231,7 +231,7 @@ class TestNovaNetwork(nmanager.NovaNetworkScenarioTest):
self.verify(250, self._check_connectivity_from_vm,
6, ("Connectivity to 8.8.8.8 from the VM doesn`t "
"function properly."),
"function properly."),
'public connectivity checking from VM', ip_address,
30, (6, 30))

View File

@ -10,4 +10,4 @@
# 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.
# under the License.

View File

@ -1,15 +1,19 @@
#!/usr/bin/env python
"""Openstack testing framework client
Usage: ostf.py run <test_set> [-q] [--id=<cluster_id>] [--tests=<tests>] [--url=<url>] [--timeout=<timeout>]
Usage: ostf.py run <test_set> [-q] [--id=<cluster_id>] [--tests=<tests>]
[--url=<url>] [--timeout=<timeout>]
ostf.py list [<test_set>]
-q Show test run result only after finish
-h --help Show this screen
--tests=<tests> Tests to run
--id=<cluster_id> Cluster id to use, default: OSTF_CLUSTER_ID or "1"
--url=<url> Ostf url, default: OSTF_URL or http://0.0.0.0:8989/v1
--timeout=<timeout> Amount of time after which test_run will be stopped [default: 60]
--id=<cluster_id> Cluster id to use
default: OSTF_CLUSTER_ID or "1"
--url=<url> Ostf url
default: OSTF_URL or or http://0.0.0.0:8989/v1
--timeout=<timeout> Amount of time after which test_run will be
stopped [default: 60]
"""
import os

View File

@ -10,4 +10,4 @@
# 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.
# under the License.