MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-18 20:11:17 +00:00
Code Issues Releases Wiki Activity

Updated formatting using black

Browse Source
This commit is contained in:
Josh 2020-03-01 12:40:10 -06:00 committed by Pablo Santiago Blum de Aguiar
parent 1d5e40a7c9
commit 26b7f62992
2 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
tests/rules/test_apt_unable_to_locate.py
View File

@ -1,11 +1,15 @@
from io import BytesIO from io import BytesIO
import pytest import pytest
from thefuck.rules.apt_unable_to_locate import match, get_new_command, _get_search_results from thefuck.rules.apt_unable_to_locate import (
match,
get_new_command,
_get_search_results,
)
from thefuck.types import Command from thefuck.types import Command
invalid_operation = 'E: Unable to locate package {}'.format invalid_operation = "E: Unable to locate package {}".format
apt_rabbitmq_search_results = b''' kamailio-rabbitmq-modules/bionic 5.1.2-1ubuntu2 amd64 apt_rabbitmq_search_results = b""" kamailio-rabbitmq-modules/bionic 5.1.2-1ubuntu2 amd64
RabbitMQ and AMQP integration modules for the Kamailio SIP server RabbitMQ and AMQP integration modules for the Kamailio SIP server
libanyevent-rabbitmq-perl/bionic 1.19+dfsg-1 all libanyevent-rabbitmq-perl/bionic 1.19+dfsg-1 all
@ -44,8 +48,8 @@ puppet-module-puppetlabs-rabbitmq/bionic 5.3.1-2 all
rabbitmq-server/bionic 3.6.10-1 all rabbitmq-server/bionic 3.6.10-1 all
AMQP server written in Erlang AMQP server written in Erlang
''' """
apt_get_rabbitmq_search_results = b''' apt_get_rabbitmq_search_results = b"""
kamailio-rabbitmq-modules - RabbitMQ and AMQP integration modules for the Kamailio SIP server kamailio-rabbitmq-modules - RabbitMQ and AMQP integration modules for the Kamailio SIP server
libanyevent-rabbitmq-perl - asynchronous and multi channel Perl AMQP client libanyevent-rabbitmq-perl - asynchronous and multi channel Perl AMQP client
libmojo-rabbitmq-client-perl - Mojo::IOLoop based RabbitMQ client libmojo-rabbitmq-client-perl - Mojo::IOLoop based RabbitMQ client
@ -59,61 +63,50 @@ nagios-plugins-rabbitmq - Set of Nagios checks useful for monitoring a RabbitMQ
opensips-rabbitmq-module - Interface module to interact with a RabbitMQ server opensips-rabbitmq-module - Interface module to interact with a RabbitMQ server
puppet-module-puppetlabs-rabbitmq - Puppet module for rabbitmq, manage everything from vhosts to exchanges puppet-module-puppetlabs-rabbitmq - Puppet module for rabbitmq, manage everything from vhosts to exchanges
rabbitmq-server - AMQP server written in Erlang rabbitmq-server - AMQP server written in Erlang
''' """
rabbitmq_search_search_results = [ rabbitmq_search_search_results = [
'kamailio-rabbitmq-modules', "kamailio-rabbitmq-modules",
'libanyevent-rabbitmq-perl', "libanyevent-rabbitmq-perl",
'libmojo-rabbitmq-client-perl', "libmojo-rabbitmq-client-perl",
'libmono-messaging-rabbitmq4.0-cil', "libmono-messaging-rabbitmq4.0-cil",
'libmono-rabbitmq4.0-cil', "libmono-rabbitmq4.0-cil",
'librabbitmq-client-java', "librabbitmq-client-java",
'librabbitmq-dbg', "librabbitmq-dbg",
'librabbitmq-dev', "librabbitmq-dev",
'librabbitmq4', "librabbitmq4",
'nagios-plugins-rabbitmq', "nagios-plugins-rabbitmq",
'opensips-rabbitmq-module', "opensips-rabbitmq-module",
'puppet-module-puppetlabs-rabbitmq', "puppet-module-puppetlabs-rabbitmq",
'rabbitmq-server' "rabbitmq-server",
] ]
@pytest.mark.parametrize( @pytest.mark.parametrize(
'command', "command",
[ [
( (Command("apt install rabbitmq", invalid_operation("rabbitmq"))),
Command('apt install rabbitmq', invalid_operation('rabbitmq')) (Command("apt-get install rabbitmq", invalid_operation("rabbitmq"))),
), ],
(
Command('apt-get install rabbitmq', invalid_operation('rabbitmq'))
)
]
) )
def test_match(command): def test_match(command):
assert match(command) assert match(command)
@pytest.mark.parametrize( @pytest.mark.parametrize(
'command', "command",
[ [
( (Command("yarn install reactjs", "a_bad_cmd: command not found")),
Command('yarn install reactjs', 'a_bad_cmd: command not found') (Command("npm install reactjs", "a_bad_cmd: command not found")),
), (Command("apt upgrade", "a_bad_cmd: command not found")),
( ],
Command('npm install reactjs', 'a_bad_cmd: command not found')
),
(
Command('apt upgrade', 'a_bad_cmd: command not found')
)
]
) )
def test_not_match(command): def test_not_match(command):
assert not match(command) assert not match(command)
@pytest.fixture @pytest.fixture
def set_search(mocker): def set_search(mocker):
mock = mocker.patch('subprocess.Popen') mock = mocker.patch("subprocess.Popen")
def _set_text(text): def _set_text(text):
mock.return_value.stdout = BytesIO(text) mock.return_value.stdout = BytesIO(text)
@ -122,11 +115,21 @@ def set_search(mocker):
@pytest.mark.parametrize( @pytest.mark.parametrize(
'app, command, search_text, search_results', "app, command, search_text, search_results",
[ [
('apt', 'rabbitmq', apt_rabbitmq_search_results, rabbitmq_search_search_results), (
('apt-get', 'rabbitmq', apt_get_rabbitmq_search_results, rabbitmq_search_search_results), "apt",
] "rabbitmq",
apt_rabbitmq_search_results,
rabbitmq_search_search_results,
),
(
"apt-get",
"rabbitmq",
apt_get_rabbitmq_search_results,
rabbitmq_search_search_results,
),
],
) )
def test_get_search_results(set_search, app, command, search_text, search_results): def test_get_search_results(set_search, app, command, search_text, search_results):
set_search(search_text) set_search(search_text)
@ -134,20 +137,19 @@ def test_get_search_results(set_search, app, command, search_text, search_result
@pytest.mark.parametrize( @pytest.mark.parametrize(
'command, expected_command, search_text', "command, expected_command, search_text",
[ [
( (
Command('sudo apt install rabbitmq', invalid_operation('rabbitmq')), Command("sudo apt install rabbitmq", invalid_operation("rabbitmq")),
[ [
'sudo apt install librabbitmq4', "sudo apt install librabbitmq4",
'sudo apt install rabbitmq-server', "sudo apt install rabbitmq-server",
'sudo apt install librabbitmq-dev' "sudo apt install librabbitmq-dev",
], ],
apt_rabbitmq_search_results, apt_rabbitmq_search_results,
) )
] ],
) )
def test_get_new_command(set_search, command, expected_command, search_text): def test_get_new_command(set_search, command, expected_command, search_text):
set_search(search_text) set_search(search_text)
actual_command = get_new_command(command) assert get_new_command(command) == expected_command
assert actual_command == expected_command

20
thefuck/rules/apt_unable_to_locate.py
View File

@ -5,7 +5,7 @@ from thefuck.utils import for_app, replace_command
@sudo_support @sudo_support
@for_app('apt', 'apt-get') @for_app("apt", "apt-get")
def match(command): def match(command):
return "E: Unable to locate package" in command.output return "E: Unable to locate package" in command.output
@ -15,8 +15,8 @@ def _parse_apt_search_results(search_text_lines):
for line in search_text_lines: for line in search_text_lines:
line = line.decode().strip() line = line.decode().strip()
if line.find('/') > 0: if line.find("/") > 0:
search_results.append(line.split('/')[0]) search_results.append(line.split("/")[0])
return search_results return search_results
@ -26,8 +26,8 @@ def _parse_apt_cache_search_results(search_text_lines):
for line in search_text_lines: for line in search_text_lines:
line = line.decode().strip() line = line.decode().strip()
if line.find(' - ') > 0: # spaces are important if line.find(" - ") > 0: # spaces are important
search_results.append(line.split(' - ')[0]) search_results.append(line.split(" - ")[0])
return search_results return search_results
@ -35,13 +35,13 @@ def _parse_apt_cache_search_results(search_text_lines):
def _get_search_results(app, command): def _get_search_results(app, command):
_parser = _parse_apt_search_results _parser = _parse_apt_search_results
if app == 'apt-get': if app == "apt-get":
app = 'apt-cache' app = "apt-cache"
_parser = _parse_apt_cache_search_results _parser = _parse_apt_cache_search_results
proc = subprocess.Popen([app, 'search', command], proc = subprocess.Popen(
stdout=subprocess.PIPE, [app, "search", command], stdout=subprocess.PIPE, stderr=subprocess.PIPE
stderr=subprocess.PIPE) )
lines = proc.stdout.readlines() lines = proc.stdout.readlines()
return _parser(lines) return _parser(lines)