Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored and scorphus committed Jul 9, 2023
1 parent 1a242c7 commit 5f562a1
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ flake8
Run unit tests:

```bash
py.test
pytest
```

Run unit and functional tests (requires docker):

```bash
py.test --enable-functional
pytest --enable-functional
```

For sending package to pypi:
Expand Down Expand Up @@ -89,4 +89,4 @@ Assuming you have the prerequisites:
1. Open command palette (CMD+SHIFT+P (mac) or CTRL+SHIFT+P (windows))
1. Select `Remote-Containers: Reopen in Container`.
1. Container will be built, install all pip requirements and your VSCode will mount into it automagically.
1. Your VSCode and container now essentially become a throw away environment.
1. Your VSCode and container now essentially become a throw away environment.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ following rules are enabled by default:
* `systemctl` – correctly orders parameters of confusing `systemctl`;
* `terraform_init.py` – run `terraform init` before plan or apply;
* `terraform_no_command.py` – fixes unrecognized `terraform` commands;
* `test.py` – runs `py.test` instead of `test.py`;
* `test.py` – runs `pytest` instead of `test.py`;
* `touch` – creates missing directories before "touching";
* `tsuru_login` – runs `tsuru login` if not authenticated or session expired;
* `tsuru_not_command` – fixes wrong `tsuru` commands like `tsuru shell`;
Expand Down
2 changes: 1 addition & 1 deletion tests/rules/test_fix_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
./tests/rules/test_whois.py:22:80: E501 line too long (83 > 79 characters)
"""),

FixFileTest('py.test', '/home/thefuck/tests/rules/test_fix_file.py', 218, None, """
FixFileTest('pytest', '/home/thefuck/tests/rules/test_fix_file.py', 218, None, """
monkeypatch = <_pytest.monkeypatch.monkeypatch object at 0x7fdb76a25b38>
test = ('fish a.sh', '/tmp/fix-error/a.sh', 2, None, '', "\\nfish: Unknown command 'foo'\\n/tmp/fix-error/a.sh (line 2): foo\\n ^\\n")
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def fail_on_warning(self):
def history(self, mocker):
mock = mocker.patch('thefuck.shells.shell.get_history')
# Passing as an argument causes `UnicodeDecodeError`
# with newer py.test and python 2.7
# with newer pytest and python 2.7
mock.return_value = ['le cat', 'fuck', 'ls cat',
'diff x', 'nocommand x', u'café ô']
return mock
Expand Down
2 changes: 1 addition & 1 deletion thefuck/rules/test.py.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def match(command):


def get_new_command(command):
return 'py.test'
return 'pytest'


# make it come before the python_command rule
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ envlist = py27,py35,py36,py37,py38,py39,py310

[testenv]
deps = -rrequirements.txt
commands = py.test -v --capture=sys
commands = pytest -v --capture=sys

[flake8]
ignore = E501,W503,W504
Expand Down

0 comments on commit 5f562a1

Please sign in to comment.