openstack
/
fuel-main
Code Issues Proposed changes

Update accrording new flake8 

Includes backport of fix for #1299287.

Closes-bug: #1311799
Change-Id: I49b9898eb6d3770c64fb458a6b63deecd8001a39
This commit is contained in:
NastyaUrlapova 2014-04-21 17:26:39 +04:00 committed by Dmitry Borodaenko
parent 83523b4988
commit 31a6cd9829
9 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuelweb_test/helpers/decorators.py
View File

@ -57,8 +57,7 @@ def log_snapshot_on_error(func):
logging.info("{} Make snapshot: {}".format(description, name))
logging.info(
"You could revert this snapshot using [{command}]".format(
command=
"dos.py revert {env} --snapshot-name {name} && "
command="dos.py revert {env} --snapshot-name {name} && "
"dos.py resume {env} && "
"virsh net-dumpxml {env}_admin | grep -P {pattern} -o "
"| awk {awk_command}".format(

4
fuelweb_test/settings.py
View File

@ -135,7 +135,7 @@ NEUTRON_SEGMENT = {
'vlan': 'vlan'
}
LOGS_DIR = os.environ.get('LOGS_DIR')
LOGS_DIR = os.environ.get('LOGS_DIR', os.getcwd())
USE_ALL_DISKS = os.environ.get('USE_ALL_DISKS', 'true') == 'true'
UPLOAD_MANIFESTS = os.environ.get('UPLOAD_MANIFESTS', 'false') == 'true'
@ -148,7 +148,7 @@ SITEPP_FOR_UPLOAD = os.environ.get(
KVM_USE = os.environ.get('KVM_USE', 'false') == 'true'
DEBUG_MODE = os.environ.get('DEBUG_MODE', 'true') == 'true'
#Services tests
# Services tests
SERVTEST_LOCAL_PATH = os.environ.get('SERVTEST_LOCAL_PATH', '/tmp')
SERVTEST_USERNAME = os.environ.get('SERVTEST_USERNAME', 'admin')
SERVTEST_PASSWORD = os.environ.get('SERVTEST_PASSWORD', SERVTEST_USERNAME)

8
fuelweb_test/tests/test_bonding.py
View File

@ -119,7 +119,7 @@ class BondingSimple(TestBasic):
assert_equal(str(cluster['net_provider']), 'neutron')
assert_equal(str(cluster['net_segment_type']), segment_type)
#TODO(Tatyana) uncomment when it will be implemented)
# TODO(Tatyana) uncomment when it will be implemented)
# self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
@ -215,7 +215,7 @@ class BondingSimple(TestBasic):
assert_equal(str(cluster['net_provider']), 'neutron')
assert_equal(str(cluster['net_segment_type']), segment_type)
#TODO(Tatyana) uncomment when it will be implemented)
# TODO(Tatyana) uncomment when it will be implemented)
# self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
@ -316,7 +316,7 @@ class BondingHA(TestBasic):
assert_equal(str(cluster['net_provider']), 'neutron')
assert_equal(str(cluster['net_segment_type']), segment_type)
#TODO(Tatyana) uncomment when it will be implemented)
# TODO(Tatyana) uncomment when it will be implemented)
# self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
@ -414,7 +414,7 @@ class BondingHA(TestBasic):
assert_equal(str(cluster['net_provider']), 'neutron')
assert_equal(str(cluster['net_segment_type']), segment_type)
#TODO(Tatyana) uncomment when it will be implemented)
# TODO(Tatyana) uncomment when it will be implemented)
# self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(

10
fuelweb_test/tests/test_neutron.py
View File

@ -81,7 +81,7 @@ class NeutronGre(TestBasic):
assert_equal(str(cluster['net_provider']), 'neutron')
assert_equal(str(cluster['net_segment_type']), segment_type)
#TODO(Tatyana) uncomment when it will be implemented)
# TODO(Tatyana) uncomment when it will be implemented)
# self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
@ -201,8 +201,8 @@ class NeutronGreHa(TestBasic):
assert_equal(str(cluster['net_provider']), 'neutron')
assert_equal(str(cluster['net_segment_type']), segment_type)
#TODO(Tatyana) uncomment when it will be implemented)
#self.fuel_web.verify_network(cluster_id)
# TODO(Tatyana) uncomment when it will be implemented)
# self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
cluster_id=cluster_id,
@ -262,8 +262,8 @@ class NeutronVlanHa(TestBasic):
assert_equal(str(cluster['net_provider']), 'neutron')
assert_equal(str(cluster['net_segment_type']), segment_type)
#TODO(Tatyana) uncomment when it will be implemented)
#self.fuel_web.verify_network(cluster_id)
# TODO(Tatyana) uncomment when it will be implemented)
# self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
cluster_id=cluster_id,

4
fuelweb_test/tests/test_simple.py
View File

@ -116,8 +116,8 @@ class SimpleFlat(TestBasic):
self.fuel_web.run_ostf(
cluster_id=cluster_id,
should_fail=2,
failed_test_name=['Create volume and attach it to instance',
#TODO: issue with remove floating ip
failed_test_name=['Create volume and attach it to instance'
# TODO: issue with remove floating ip
# https://bugs.launchpad.net/fuel/+bug/1263916
])

2
fuelweb_test/tests/tests_strength/test_master_node_failover.py
View File

@ -87,7 +87,7 @@ class DeploySimpleMasterNodeFail(base_test_case.TestBasic):
settings.SERVTEST_PASSWORD,
settings.SERVTEST_TENANT)
#create instance
# create instance
server = common_func.create_instance()
# get_instance details

2
fuelweb_ui_test/browser.py
View File

@ -39,7 +39,7 @@ def start_driver(browser=None):
elif browser == "headless":
driver = start_headless()
#driver.set_window_size(1024, 768)
# driver.set_window_size(1024, 768)
driver.maximize_window()
driver.implicitly_wait(SELENIUM_IMPLICIT_WAIT)
return driver

2
fuelweb_ui_test/pageobjects/base.py
View File

@ -131,7 +131,7 @@ class Popup(PageObject):
element = browser.driver.find_element_by_css_selector('div.modal')
PageObject.__init__(self, element)
time.sleep(0.5)
#PageObject.wait_until_moving(self.parent)
# PageObject.wait_until_moving(self.parent)
def wait_until_exists(self):
try:

2
run_tests.sh
View File

@ -3,5 +3,5 @@
set -e
set -x
flake8 --ignore=H302,H802 --exclude bin/,include/,lib/,local/,tmp/ --show-source fuelweb_test fuelweb_ui_test
flake8 --ignore=H301,H302,H306,H802 --exclude bin/,include/,lib/,local/,tmp/ --show-source fuelweb_test fuelweb_ui_test