-
Notifications
You must be signed in to change notification settings - Fork 5
Pytest upgrade from pytest 3 to pytest 6 #3
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.
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
tking16
wants to merge
12
commits into
GlobalRadio:main
Choose a base branch
from
tking16:pytest-upgrade-from-pytest-3-to-pytest-6
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
0cb31f8
Changed get_json to use the requests library for the ability to add n…
tking16 857f30a
Deprected MarkInfo resolution
tking16 3a9e54a
attempting to fix driver_class and kwargs errors
tking16 2c2ee8d
Revert "Deprected MarkInfo resolution"
tking16 fb3a2d3
Merge branch 'pytest-upgrade-from-pytest-3-to-pytest-6' of https://gi…
tking16 61515e0
trying to revert my mistakes
tking16 00af697
removed warning by making driver_class and driver_kwargs not fixtures
tking16 d8bac1f
removed pytest.yield_fixture from driver func
tking16 dcb475b
replacing old pytest.yield_fixutres
tking16 2ad6933
replacing old pytest.yield_fixutres
tking16 1472bf9
replacing old pytest.yield_fixutres
tking16 e8bd328
removing egg files which should be ignored
tking16 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,6 @@ | |
**/.cache | ||
**/__pycache__ | ||
|
||
**/.vscode | ||
**/.vscode | ||
|
||
.pytest_appium.egg-info | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
import json | ||
import urllib #.request | ||
import time | ||
import requests | ||
|
||
|
||
def _decode_response(response): | ||
|
@@ -12,8 +13,9 @@ def _decode_response(response): | |
return json.loads(data.decode(encoding)) | ||
|
||
|
||
def get_json(url): | ||
return _decode_response(urllib.request.urlopen(url)) | ||
def get_json(url, headers: dict=None): | ||
r = requests.get(url, headers=headers) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any reason for not also updating the post if we're swapping urlib for requests? |
||
return r.json() | ||
|
||
|
||
def post_json(url, data): | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can probably just make this *.egg-info tbh