openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Update class names from lowercase to CamelCase"

This commit is contained in:
Jenkins 2015-11-19 13:21:19 +00:00 committed by Gerrit Code Review
parent a1cb3d2e39 c8ae05294d
commit db451d6d3b
11 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelweb_test/__init__.py
View File

@ -64,7 +64,7 @@ def debug(logger):
logwrap = debug(logger)
class quiet_logger(object):
class QuietLogger(object):
"""Reduce logging level while context is executed."""
def __enter__(self):

4
fuelweb_test/helpers/decorators.py
View File

@ -39,7 +39,7 @@ from fuelweb_test.helpers.utils import get_current_env
from fuelweb_test.helpers.utils import pull_out_logs_via_ssh
from fuelweb_test.helpers.utils import store_astute_yaml
from fuelweb_test.helpers.utils import store_packages_json
from fuelweb_test.helpers.utils import timestat
from fuelweb_test.helpers.utils import TimeStat
def save_logs(url, path, auth_token=None, chunk_size=1024):
@ -495,7 +495,7 @@ def duration(func):
"""
@functools.wraps(func)
def wrapper(*args, **kwargs):
with timestat(func.__name__):
with TimeStat(func.__name__):
return func(*args, **kwargs)
return wrapper

6
fuelweb_test/helpers/utils.py
View File

@ -220,10 +220,10 @@ def update_yaml(yaml_tree=None, yaml_value='', is_uniq=True,
yaml.dump(yaml_data, f, default_flow_style=False)
class timestat(object):
class TimeStat(object):
""" Context manager for measuring the execution time of the code.
Usage:
with timestat([name],[is_uniq=True]):
with TimeStat([name],[is_uniq=True]):
"""
def __init__(self, name=None, is_uniq=False):
@ -562,7 +562,7 @@ def get_node_hiera_roles(remote):
return roles
class runlimit(object):
class RunLimit(object):
def __init__(self, seconds=60, error_message='Timeout'):
self.seconds = seconds
self.error_message = error_message

4
fuelweb_test/models/environment.py
View File

@ -37,7 +37,7 @@ from fuelweb_test.helpers.fuel_actions import PostgresActions
from fuelweb_test.helpers.fuel_actions import NessusActions
from fuelweb_test.helpers.ntp import GroupNtpSync
from fuelweb_test.helpers.utils import run_on_remote
from fuelweb_test.helpers.utils import timestat
from fuelweb_test.helpers.utils import TimeStat
from fuelweb_test.helpers import multiple_networks_hacks
from fuelweb_test.models.fuel_web_client import FuelWebClient
from fuelweb_test.models.collector_client import CollectorClient
@ -126,7 +126,7 @@ class EnvironmentModel(object):
# remove after better fix is applied
time.sleep(5)
with timestat("wait_for_nodes_to_start_and_register_in_nailgun"):
with TimeStat("wait_for_nodes_to_start_and_register_in_nailgun"):
wait(lambda: all(self.nailgun_nodes(devops_nodes)), 15, timeout)
if not skip_timesync:

8
fuelweb_test/models/fuel_web_client.py
View File

@ -53,7 +53,7 @@ from fuelweb_test import logger
from fuelweb_test import logwrap
from fuelweb_test.models.nailgun_client import NailgunClient
from fuelweb_test import ostf_test_mapping as map_ostf
from fuelweb_test import quiet_logger
from fuelweb_test import QuietLogger
import fuelweb_test.settings as help_data
from fuelweb_test.settings import ATTEMPTS
from fuelweb_test.settings import BONDING
@ -152,7 +152,7 @@ class FuelWebClient(object):
if self.get_cluster_mode(cluster_id) == DEPLOYMENT_MODE_HA:
logger.info('Waiting {0} sec. for passed OSTF HA tests.'
.format(timeout))
with quiet_logger():
with QuietLogger():
_wait(lambda: self.run_ostf(cluster_id,
test_sets=['ha'],
should_fail=should_fail),
@ -169,7 +169,7 @@ class FuelWebClient(object):
Should be used before run any other check for services."""
logger.info('Waiting {0} sec. for passed OSTF Sanity checks.'
.format(timeout))
with quiet_logger():
with QuietLogger():
_wait(lambda: self.run_ostf(cluster_id,
test_sets=['sanity'],
should_fail=should_fail),
@ -1289,7 +1289,7 @@ class FuelWebClient(object):
return
try:
task = self.run_network_verify(cluster_id)
with quiet_logger():
with QuietLogger():
if success:
self.assert_task_success(task, timeout, interval=10)
else:

4
fuelweb_test/tests/base_test_case.py
View File

@ -19,7 +19,7 @@ from proboscis import test
from fuelweb_test import logger
from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.helpers.utils import get_test_method_name
from fuelweb_test.helpers.utils import timestat
from fuelweb_test.helpers.utils import TimeStat
from fuelweb_test.models.environment import EnvironmentModel
from fuelweb_test.settings import REPLACE_DEFAULT_REPOS
from fuelweb_test.settings import REPLACE_DEFAULT_REPOS_ONLY_ONCE
@ -116,7 +116,7 @@ class SetupEnvironment(TestBasic):
"""
self.check_run("empty")
with timestat("setup_environment", is_uniq=True):
with TimeStat("setup_environment", is_uniq=True):
self.env.setup_environment()
self.env.make_snapshot("empty", is_make=True)

10
fuelweb_test/tests/test_backup_restore.py
View File

@ -21,7 +21,7 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.helpers import os_actions
from devops.helpers.helpers import wait
from devops.error import TimeoutError
from fuelweb_test.helpers.utils import runlimit
from fuelweb_test.helpers.utils import RunLimit
from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
from fuelweb_test.tests.test_ha_one_controller_base\
@ -60,7 +60,7 @@ class TestAdminNodeBackupRestore(TestBasic):
with self.env.d_env.get_admin_remote() as remote:
self.fuel_web.backup_master(remote)
checkers.backup_check(remote)
with runlimit(
with RunLimit(
seconds=60 * 10,
error_message="'dockerctl restore' "
"run longer then 600 sec"):
@ -139,7 +139,7 @@ class BackupRestoreHAOneController(HAOneControllerNeutronBase):
3, len(self.fuel_web.client.list_cluster_nodes(cluster_id)))
with self.env.d_env.get_admin_remote() as remote:
with runlimit(
with RunLimit(
seconds=60 * 10,
error_message="'dockerctl restore' "
"run longer then 600 sec"):
@ -229,7 +229,7 @@ class BackupRestoreHA(NeutronTunHaBase):
6, len(self.fuel_web.client.list_cluster_nodes(cluster_id)))
with self.env.d_env.get_admin_remote() as remote:
with runlimit(
with RunLimit(
seconds=60 * 10,
error_message="'dockerctl restore' "
"run longer then 600 sec"):
@ -301,7 +301,7 @@ class BackupRestoreHA(NeutronTunHaBase):
self.env.d_env.nodes().slaves[:3], timeout=10 * 60)
with self.env.d_env.get_admin_remote() as remote:
with runlimit(
with RunLimit(
seconds=60 * 10,
error_message="'dockerctl restore' "
"runned longer then 600 sec"):

4
fuelweb_test/tests/test_neutron_tun.py
View File

@ -27,7 +27,7 @@ from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
from fuelweb_test.tests.test_neutron_tun_base import NeutronTunHaBase
from fuelweb_test import logger
from fuelweb_test import quiet_logger
from fuelweb_test import QuietLogger
@test(groups=["ha_neutron_tun", "neutron", "smoke_neutron", "deployment"])
@ -280,7 +280,7 @@ class TestHaNeutronScalability(TestBasic):
def _check_pacemarker(devops_nodes):
for devops_node in devops_nodes:
with quiet_logger():
with QuietLogger():
self.fuel_web.assert_pacemaker(
devops_node.name,
devops_nodes, [])

6
fuelweb_test/tests/tests_strength/test_failover_base.py
View File

@ -19,7 +19,7 @@ from devops.error import TimeoutError
from devops.helpers.helpers import _wait
from devops.helpers.helpers import tcp_ping
from devops.helpers.helpers import wait
from fuelweb_test.helpers.utils import runlimit
from fuelweb_test.helpers.utils import RunLimit
from proboscis.asserts import assert_equal
from proboscis.asserts import assert_false
from proboscis.asserts import assert_not_equal
@ -1261,7 +1261,7 @@ class TestHaFailoverBase(TestBasic):
with self.fuel_web.get_ssh_for_node(node.name) as remote:
cmd = 'rabbitmqctl cluster_status'
exit_code = [2, 0] if negative else [0]
with runlimit(seconds=60,
with RunLimit(seconds=60,
error_message=err_msg.format(cmd)):
out = run_on_remote(remote, cmd=cmd,
assert_ec_equal=exit_code)
@ -1300,7 +1300,7 @@ class TestHaFailoverBase(TestBasic):
for node in d_ctrls:
with self.fuel_web.get_ssh_for_node(node.name) as remote:
cmd = 'rabbitmqctl list_queues'
with runlimit(seconds=30,
with RunLimit(seconds=30,
error_message=err_msg.format(cmd)):
run_on_remote(remote, cmd)

4
system_test/helpers/decorators.py
View File

@ -19,7 +19,7 @@ import hashlib
from proboscis import SkipTest
from fuelweb_test.helpers.utils import timestat
from fuelweb_test.helpers.utils import TimeStat
from fuelweb_test.helpers.utils import pull_out_logs_via_ssh
from fuelweb_test.helpers.decorators import create_diagnostic_snapshot
@ -41,7 +41,7 @@ def action(method):
def step_start_stop(func):
@functools.wraps(func)
def wrapper(*args, **kwargs):
with timestat(func) as timer:
with TimeStat(func) as timer:
step_name = getattr(func, '_step_name')
start_step = '[ START {} ]'.format(step_name)
header = "<<< {:-^142} >>>".format(start_step)

4
system_test/tests/actions_base.py
View File

@ -18,7 +18,7 @@ from proboscis.asserts import assert_equal
from proboscis.asserts import assert_true
from fuelweb_test.helpers import checkers
from fuelweb_test.helpers.utils import timestat
from fuelweb_test.helpers.utils import TimeStat
from fuelweb_test import settings as test_settings
from system_test import logger
@ -76,7 +76,7 @@ class PrepareBase(base_actions_factory.BaseActionsFactory):
def setup_master(self):
"""Setup master node"""
self.check_run("empty")
with timestat("setup_environment", is_uniq=True):
with TimeStat("setup_environment", is_uniq=True):
self.env.setup_environment()
self.env.make_snapshot("empty", is_make=True)