diff --git a/fuel_tests/models/manager.py b/fuel_tests/models/manager.py index 907d7a42a..c398b4ac1 100644 --- a/fuel_tests/models/manager.py +++ b/fuel_tests/models/manager.py @@ -12,6 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. +# pylint: disable=redefined-builtin +from six.moves import xrange +# pylint: enable=redefined-builtin + from fuelweb_test import logger from fuelweb_test import settings from fuelweb_test.helpers.decorators import create_diagnostic_snapshot @@ -36,6 +40,7 @@ class Manager(Basic): if config_file: self._load_config() self._context = cls + self.assigned_slaves = set() def _cluster_from_template(self): """Create cluster from template file.""" @@ -241,12 +246,10 @@ class Manager(Basic): self.env.make_snapshot(snapshot_name, is_make=True) self.env.resume_environment() return True - else: - logger.error("Can't bootstrap nodes because release " - "snapshot didn't revert") - return False - raise RuntimeError("Can't bootstrap nodes because release " - "snapshot didn't revert") + logger.error( + "Can't bootstrap nodes because release snapshot didn't revert") + raise RuntimeError( + "Can't bootstrap nodes because release snapshot didn't revert") def get_ready_cluster(self, config=None): """Create and deploy cluster.""" diff --git a/fuel_tests/tests/conftest.py b/fuel_tests/tests/conftest.py index 37ceb4ca5..4e1c4f76b 100644 --- a/fuel_tests/tests/conftest.py +++ b/fuel_tests/tests/conftest.py @@ -11,6 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +from __future__ import division import time @@ -24,6 +25,9 @@ from fuelweb_test import settings from system_test.core.discover import config_filter +# pylint: disable=no-member + + @pytest.fixture(scope='session') def config_file(request): """Fixture which provide config for test.""" @@ -126,7 +130,9 @@ def pytest_runtest_teardown(item): step_name = item.function.__name__ spent_time = time.time() - item._start_time minutes = spent_time // 60 + # pylint: disable=round-builtin seconds = int(round(spent_time)) % 60 + # pylint: enable=round-builtin finish_step = "FINISH {} STEP TOOK {} min {} sec".format( step_name, minutes, seconds) foot = "\n" + "<" * 5 + "#" * 30 + "[ {} ]" + "#" * 30 + ">" * 5 diff --git a/fuel_tests/tests/test_ceph.py b/fuel_tests/tests/test_ceph.py index 15a539582..13422c67c 100644 --- a/fuel_tests/tests/test_ceph.py +++ b/fuel_tests/tests/test_ceph.py @@ -20,6 +20,9 @@ from fuelweb_test.helpers import checkers from fuelweb_test.helpers.ssh_manager import SSHManager +# pylint: disable=no-member + + ssh_manager = SSHManager() diff --git a/fuel_tests/tests/test_neutron.py b/fuel_tests/tests/test_neutron.py index fc8ccf535..b07ac02f7 100644 --- a/fuel_tests/tests/test_neutron.py +++ b/fuel_tests/tests/test_neutron.py @@ -21,6 +21,9 @@ from fuelweb_test.helpers import os_actions from fuelweb_test.helpers.ssh_manager import SSHManager +# pylint: disable=no-member + + ssh_manager = SSHManager() diff --git a/tox.ini b/tox.ini index 47c3cc738..e07bb4fc7 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ [tox] skipsdist = True -envlist = pep8, py27, pylint, docs, pep8-py{34,35}, pylint-py{27}-{fuelweb,system,gates} +envlist = pep8, py27, pylint, docs, pep8-py{34,35}, pylint-py{27}-{fuelweb,system,gates,fuel} skip_missing_interpreters = True [testenv] @@ -47,7 +47,7 @@ deps= -r{toxinidir}/fuelweb_test/requirements.txt pylint commands= - pylint --rcfile=.pylintrc_gerrit fuelweb_test system_test gates_tests + pylint --rcfile=.pylintrc_gerrit fuelweb_test system_test gates_tests fuel_tests [testenv:pylint-py27-fuelweb] @@ -68,6 +68,13 @@ deps= pylint commands=pylint gates_tests +[testenv:pylint-py27-fuel] +deps= + -r{toxinidir}/fuelweb_test/requirements.txt + pylint +commands=pylint fuel_tests + + [testenv:docs] changedir = doc deps =