Update hacking for Python3
The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Fix problems found. Update local hacking checks for new flake8. Change-Id: Ib3907677d373ba9a92f9efc807af483c33347c9f
This commit is contained in:
parent
740e4a5456
commit
697382ddc2
|
@ -229,6 +229,7 @@ def _init_general_configs():
|
||||||
configs.append(ENABLE_DATA_LOCALITY)
|
configs.append(ENABLE_DATA_LOCALITY)
|
||||||
return configs
|
return configs
|
||||||
|
|
||||||
|
|
||||||
PLUGIN_GENERAL_CONFIGS = _init_general_configs()
|
PLUGIN_GENERAL_CONFIGS = _init_general_configs()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -232,8 +232,8 @@ def _check_datanodes_count(remote, count):
|
||||||
LOG.debug("Checking datanode count")
|
LOG.debug("Checking datanode count")
|
||||||
exit_code, stdout = remote.execute_command(
|
exit_code, stdout = remote.execute_command(
|
||||||
'sudo su -lc "hdfs dfsadmin -report" hadoop | '
|
'sudo su -lc "hdfs dfsadmin -report" hadoop | '
|
||||||
'grep \'Live datanodes\|Datanodes available:\' | '
|
r'grep \'Live datanodes\|Datanodes available:\' | '
|
||||||
'grep -o \'[0-9]\+\' | head -n 1')
|
r'grep -o \'[0-9]\+\' | head -n 1')
|
||||||
LOG.debug("Datanode count='{count}'".format(count=stdout.rstrip()))
|
LOG.debug("Datanode count='{count}'".format(count=stdout.rstrip()))
|
||||||
|
|
||||||
return exit_code == 0 and stdout and int(stdout) == count
|
return exit_code == 0 and stdout and int(stdout) == count
|
||||||
|
|
|
@ -25,6 +25,7 @@ def mock_event_wrapper(*args, **kwargs):
|
||||||
return decorated_function
|
return decorated_function
|
||||||
return decorator
|
return decorator
|
||||||
|
|
||||||
|
|
||||||
from sahara.plugins import edp
|
from sahara.plugins import edp
|
||||||
from sahara.plugins import utils as pu
|
from sahara.plugins import utils as pu
|
||||||
mock.patch('sahara.plugins.utils.event_wrapper', mock_event_wrapper).start()
|
mock.patch('sahara.plugins.utils.event_wrapper', mock_event_wrapper).start()
|
||||||
|
@ -254,8 +255,8 @@ class RunScriptsTest(base.SaharaTestCase):
|
||||||
self.assertEqual(rs._check_datanodes_count(self.r, 1), True)
|
self.assertEqual(rs._check_datanodes_count(self.r, 1), True)
|
||||||
self.r.execute_command.assert_called_once_with(
|
self.r.execute_command.assert_called_once_with(
|
||||||
'sudo su -lc "hdfs dfsadmin -report" hadoop | '
|
'sudo su -lc "hdfs dfsadmin -report" hadoop | '
|
||||||
'grep \'Live datanodes\|Datanodes available:\' | '
|
r'grep \'Live datanodes\|Datanodes available:\' | '
|
||||||
'grep -o \'[0-9]\+\' | head -n 1')
|
r'grep -o \'[0-9]\+\' | head -n 1')
|
||||||
|
|
||||||
def test_hive_create_warehouse_dir(self):
|
def test_hive_create_warehouse_dir(self):
|
||||||
rs._hive_create_warehouse_dir(self.r)
|
rs._hive_create_warehouse_dir(self.r)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
hacking>=3.0,<3.1.0 # Apache-2.0
|
||||||
|
|
||||||
bandit>=1.1.0 # Apache-2.0
|
bandit>=1.1.0 # Apache-2.0
|
||||||
bashate>=0.5.1 # Apache-2.0
|
bashate>=0.5.1 # Apache-2.0
|
||||||
|
|
3
tox.ini
3
tox.ini
|
@ -94,7 +94,8 @@ enable-extensions=H904,H106,H203,H204,H205
|
||||||
# [E402] Module level import not at top of file
|
# [E402] Module level import not at top of file
|
||||||
# [E731] Do not assign a lambda expression, use a def
|
# [E731] Do not assign a lambda expression, use a def
|
||||||
# [W503] Line break occurred before a binary operator
|
# [W503] Line break occurred before a binary operator
|
||||||
ignore=E123,E226,E402,E731,W503
|
# [W504] line break after binary operator
|
||||||
|
ignore=E123,E226,E402,E731,W503,W504
|
||||||
|
|
||||||
[testenv:lower-constraints]
|
[testenv:lower-constraints]
|
||||||
deps =
|
deps =
|
||||||
|
|
Loading…
Reference in New Issue