Skip to content

Update pytest to support python 3.9+ #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update pytest to support python 3.9+ #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pytest/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ def more_test_cases(tstate):
tstate.stop = True
tc.fail(str(err))
fset = clnt.uxreaddir(b'/')
fset = [i for i in fset if i != '.' and i != '..']
fset = [i for i in fset if i != b'.' and i != b'..']
tc.trace("what's left after removing everything: {0!r}".format(fset))
if fset:
tstate.stop = True
Expand Down Expand Up @@ -555,7 +555,7 @@ def more_test_cases(tstate):
fid, _, _, _ = clnt.uxopen(b'/dir/file', os.O_CREAT | os.O_RDWR, 0o666,
gid=tstate.gid)
tc.autoclunk(fid)
written = clnt.write(fid, 0, 'bytes\n')
written = clnt.write(fid, 0, b'bytes\n')
if written != 6:
tc.trace('expected to write 6 bytes, actually wrote %d', written,
level=logging.WARN)
Expand Down Expand Up @@ -594,7 +594,7 @@ def more_test_cases(tstate):
fid, _, _, _ = clnt.uxopen(b'file', os.O_CREAT | os.O_RDWR,
0o666, startdir=subfid, gid=tstate.gid)
tc.autoclunk(fid)
written = clnt.write(fid, 0, 'filedata\n')
written = clnt.write(fid, 0, b'filedata\n')
if written != 9:
tc.trace('expected to write 9 bytes, actually wrote %d', written,
level=logging.WARN)
Expand Down
2 changes: 1 addition & 1 deletion pytest/p9conn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1779,7 +1779,7 @@ def flags_to_linux_flags(flags):

result = flags & os.O_RDWR
flags &= ~os.O_RDWR
for key, value in flagmap.iteritems():
for key, value in flagmap.items():
if flags & key:
result |= value
flags &= ~key
Expand Down