Skip to content

Commit

Permalink
Merge branch 'bugy:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
UrekD committed Jul 4, 2023
2 parents c8c8a2b + 4225459 commit 3031151
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/e2e_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ def pytest_configure(config):
with open(CONFIG_PATH) as config_file:
data = json.load(config_file)
for config_item in data.keys():
config._metadata[str(config_item)] = str(data[config_item])
# https://github.com/pytest-dev/pytest-metadata/issues/70
from pytest_metadata.plugin import metadata_key
config.stash[metadata_key][str(config_item)] = str(data[config_item])


def pytest_html_report_title(report):
Expand Down
2 changes: 1 addition & 1 deletion src/web/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ def set_extra_headers(self, path):
encoded_filename = urllib.parse.quote(filename, encoding='utf-8')
self.set_header('Content-Disposition', 'attachment; filename*=UTF-8\'\'' + encoded_filename + '')

@check_authorization
@check_authorization_sync
def validate_absolute_path(self, root, absolute_path):
audit_name = get_audit_name_from_request(self)
user_id = identify_user(self)
Expand Down

0 comments on commit 3031151

Please sign in to comment.