mirror of
https://github.com/nvbn/thefuck.git
synced 2025-04-16 07:40:44 +01:00
#602: Little cleanup
This commit is contained in:
parent
c2b597f22b
commit
9e8b4f594d
@ -2,9 +2,8 @@ import pytest
|
|||||||
from thefuck.rules.hostscli import no_website, get_new_command, match
|
from thefuck.rules.hostscli import no_website, get_new_command, match
|
||||||
from tests.utils import Command
|
from tests.utils import Command
|
||||||
|
|
||||||
|
|
||||||
no_website_long = '''
|
no_website_long = '''
|
||||||
%s:
|
{}:
|
||||||
|
|
||||||
No Domain list found for website: a_website_that_does_not_exist
|
No Domain list found for website: a_website_that_does_not_exist
|
||||||
|
|
||||||
@ -12,20 +11,19 @@ Please raise a Issue here: https://github.com/dhilipsiva/hostscli/issues/new
|
|||||||
if you think we should add domains for this website.
|
if you think we should add domains for this website.
|
||||||
|
|
||||||
type `hostscli websites` to see a list of websites that you can block/unblock
|
type `hostscli websites` to see a list of websites that you can block/unblock
|
||||||
''' % no_website
|
'''.format(no_website)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command', [
|
@pytest.mark.parametrize('command', [
|
||||||
Command(
|
Command('hostscli block a_website_that_does_not_exist',
|
||||||
'sudo hostscli block a_website_that_does_not_exist',
|
|
||||||
stderr=no_website_long)])
|
stderr=no_website_long)])
|
||||||
def test_match(command):
|
def test_match(command):
|
||||||
assert match(command)
|
assert match(command)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, result', [(
|
@pytest.mark.parametrize('command, result', [(
|
||||||
Command(
|
Command('hostscli block a_website_that_does_not_exist',
|
||||||
'sudo hostscli block a_website_that_does_not_exist',
|
stderr=no_website_long),
|
||||||
stderr=no_website_long), ['hostscli websites'])])
|
['hostscli websites'])])
|
||||||
def test_get_new_command(command, result):
|
def test_get_new_command(command, result):
|
||||||
assert get_new_command(command) == result
|
assert get_new_command(command) == result
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
import re
|
import re
|
||||||
|
from thefuck.specific.sudo import sudo_support
|
||||||
from thefuck.utils import replace_command
|
from thefuck.utils import replace_command, for_app
|
||||||
|
|
||||||
no_command = "Error: No such command"
|
no_command = "Error: No such command"
|
||||||
no_website = "hostscli.errors.WebsiteImportError"
|
no_website = "hostscli.errors.WebsiteImportError"
|
||||||
|
|
||||||
|
|
||||||
|
@sudo_support
|
||||||
|
@for_app('hostscli')
|
||||||
def match(command):
|
def match(command):
|
||||||
errors = [no_command, no_website]
|
errors = [no_command, no_website]
|
||||||
for error in errors:
|
for error in errors:
|
||||||
@ -14,9 +16,11 @@ def match(command):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
@sudo_support
|
||||||
def get_new_command(command):
|
def get_new_command(command):
|
||||||
if no_website in command.stderr:
|
if no_website in command.stderr:
|
||||||
return ['hostscli websites']
|
return ['hostscli websites']
|
||||||
|
|
||||||
misspelled_command = re.findall(
|
misspelled_command = re.findall(
|
||||||
r'Error: No such command ".*"', command.stderr)[0]
|
r'Error: No such command ".*"', command.stderr)[0]
|
||||||
commands = ['block', 'unblock', 'websites', 'block_all', 'unblock_all']
|
commands = ['block', 'unblock', 'websites', 'block_all', 'unblock_all']
|
||||||
|
Loading…
x
Reference in New Issue
Block a user