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

Only consider raw command in output (#931)

Browse Source 
* Only consider raw command in output match

... else it will not work for localized messages.

Example German output:
```
Führen Sie »apt list --upgradable« aus, um sie anzuzeigen.
```

* added german output test

* make the linter happy
This commit is contained in:
tobixx 2019-08-19 21:39:14 +02:00 committed by Vladimir Iakovlev
parent 01a5ba99d0
commit 3bbe391391
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/rules/test_apt_list_upgradable.py
View File

@ -1,8 +1,10 @@
# -*- coding: utf-8 -*-
import pytest import pytest
from thefuck.rules.apt_list_upgradable import get_new_command, match from thefuck.rules.apt_list_upgradable import get_new_command, match
from thefuck.types import Command from thefuck.types import Command
match_output = ''' full_english_output = '''
Hit:1 http://us.archive.ubuntu.com/ubuntu zesty InRelease Hit:1 http://us.archive.ubuntu.com/ubuntu zesty InRelease
Hit:2 http://us.archive.ubuntu.com/ubuntu zesty-updates InRelease Hit:2 http://us.archive.ubuntu.com/ubuntu zesty-updates InRelease
Get:3 http://us.archive.ubuntu.com/ubuntu zesty-backports InRelease [89.2 kB] Get:3 http://us.archive.ubuntu.com/ubuntu zesty-backports InRelease [89.2 kB]
@ -17,6 +19,11 @@ Reading state information... Done
8 packages can be upgraded. Run 'apt list --upgradable' to see them. 8 packages can be upgraded. Run 'apt list --upgradable' to see them.
''' '''
match_output = [
full_english_output,
'Führen Sie »apt list --upgradable« aus, um sie anzuzeigen.' # German
]
no_match_output = ''' no_match_output = '''
Hit:1 http://us.archive.ubuntu.com/ubuntu zesty InRelease Hit:1 http://us.archive.ubuntu.com/ubuntu zesty InRelease
Get:2 http://us.archive.ubuntu.com/ubuntu zesty-updates InRelease [89.2 kB] Get:2 http://us.archive.ubuntu.com/ubuntu zesty-updates InRelease [89.2 kB]
@ -48,8 +55,9 @@ All packages are up to date.
''' '''
def test_match(): @pytest.mark.parametrize('output', match_output)
assert match(Command('sudo apt update', match_output)) def test_match(output):
assert match(Command('sudo apt update', output))
@pytest.mark.parametrize('command', [ @pytest.mark.parametrize('command', [
@ -67,9 +75,10 @@ def test_not_match(command):
assert not match(command) assert not match(command)
def test_get_new_command(): @pytest.mark.parametrize('output', match_output)
new_command = get_new_command(Command('sudo apt update', match_output)) def test_get_new_command(output):
new_command = get_new_command(Command('sudo apt update', output))
assert new_command == 'sudo apt list --upgradable' assert new_command == 'sudo apt list --upgradable'
new_command = get_new_command(Command('apt update', match_output)) new_command = get_new_command(Command('apt update', output))
assert new_command == 'apt list --upgradable' assert new_command == 'apt list --upgradable'

2
thefuck/rules/apt_list_upgradable.py
View File

@ -8,7 +8,7 @@ enabled_by_default = apt_available
@sudo_support @sudo_support
@for_app('apt') @for_app('apt')
def match(command): def match(command):
return "Run 'apt list --upgradable' to see them." in command.output return 'apt list --upgradable' in command.output
@sudo_support @sudo_support