MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-09-19 03:32:31 +01:00
Code Issues Releases Wiki Activity

Revert "Merge pull request #36 from jjmason/improve-no-command"

Browse Source 
This reverts commit 28a5c1214b, reversing
changes made to 3f0cbb9326.
This commit is contained in:
nvbn
2015-04-19 14:58:44 +02:00
parent 28a5c1214b
commit ab91eaf73d
2 changed files with 11 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/rules/test_no_command.py
View File

@@ -9,27 +9,16 @@ from thefuck.main import Command
def command_found():
return b'''No command 'aptget' found, did you mean:
Command 'apt-get' from package 'apt' (main)
Command 'not-installed' from package 'derp' (main)
Command 'not-really-used' from package 'whatever' (main)
aptget: command not found
'''
@pytest.fixture
def uninstalled_command_found():
return b'''No command 'pish' found, did you mean:
Command 'vish' from package 'vish' (universe)
Command 'wish' from package 'tk' (main)
Command 'fish' from package 'fish' (universe)
Command 'pdsh' from package 'pdsh' (universe)
pish: command not found
'''
@pytest.fixture
def command_not_found():
return b'''No command 'vom' found, but there are 19 similar ones
vom: command not found
'''
@pytest.fixture
def bins_exists(request):
p = patch('thefuck.rules.no_command.which',
@@ -37,26 +26,6 @@ def bins_exists(request):
p.start()
request.addfinalizer(p.stop)
@pytest.fixture
def bin_might_exist(request):
def side_effect(name):
return name in ['not-really-used', 'apt-get', '/usr/lib/command-not-found', 'test']
p = patch('thefuck.rules.no_command.which',
side_effect = side_effect)
p.start()
request.addfinalizer(p.stop)
@pytest.fixture
def patch_history(request):
def side_effect(name):
return 2 if name == 'not-really-used' else 12
p = patch('thefuck.rules.no_command._count_history_uses',
side_effect = side_effect)
p.start()
request.addfinalizer(p.stop)
@pytest.fixture
def settings():
@@ -65,12 +34,12 @@ def settings():
return _Settings
@pytest.mark.usefixtures('bin_might_exist', 'patch_history')
def test_match(command_found, command_not_found, uninstalled_command_found, settings):
@pytest.mark.usefixtures('bins_exists')
def test_match(command_found, command_not_found, settings):
with patch('thefuck.rules.no_command.Popen') as Popen:
Popen.return_value.stderr.read.return_value = command_found
assert match(Command('aptget install vim', '', ''), settings)
Popen.assert_called_with('/usr/lib/command-not-found aptget',
Popen.assert_called_once_with('/usr/lib/command-not-found aptget',
shell=True, stderr=PIPE)
Popen.return_value.stderr.read.return_value = command_not_found
assert not match(Command('ls', '', ''), settings)
@@ -79,14 +48,11 @@ def test_match(command_found, command_not_found, uninstalled_command_found, sett
Popen.return_value.stderr.read.return_value = command_found
assert match(Command('sudo aptget install vim', '', ''),
Mock(command_not_found='test'))
Popen.assert_called_with('test aptget',
Popen.assert_called_once_with('test aptget',
shell=True, stderr=PIPE)
with patch('thefuck.rules.no_command.Popen') as Popen:
Popen.return_value.stderr.read.return_value = uninstalled_command_found
assert not match(Command('pish bla blah', '', ''), settings)
@pytest.mark.usefixtures('bin_might_exist', 'patch_history')
@pytest.mark.usefixtures('bins_exists')
def test_get_new_command(command_found):
with patch('thefuck.rules.no_command._get_output',
return_value=command_found.decode()):