Skip to content

fix: Compare integration tests results using hash of file content instead of image compare #2086

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

Merged
merged 6 commits into from
Jul 10, 2021
Merged

fix: Compare integration tests results using hash of file content instead of image compare #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2aacd6d
change yaml.load to yaml.safe_load for the security best practice
mingkun2020 Mar 2, 2021
060102c
use yaml_parse for consistant style
mingkun2020 Mar 2, 2021
a6ec11e
Merge branch 'develop' of https://github.com/aws/serverless-applicati…
mingkun2020 Jul 8, 2021
b66e8bb
Merge branch 'develop' of https://github.com/aws/serverless-applicati…
mingkun2020 Jul 9, 2021
8bf03ce
remove pillow library for image comparing, use hash instead
mingkun2020 Jul 9, 2021
ceb3268
make it compatible with py2
mingkun2020 Jul 9, 2021
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
14 changes: 8 additions & 6 deletions integration/combination/test_api_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from io import BytesIO
import hashlib

try:
from pathlib import Path
Expand All @@ -10,8 +10,6 @@

from integration.helpers.base_test import BaseTest

from PIL import Image


class TestApiSettings(BaseTest):
def test_method_settings(self):
Expand Down Expand Up @@ -163,11 +161,15 @@ def verify_binary_media_request(self, url, expected_status_code):
response = requests.get(url, headers=headers)

status = response.status_code
expected = Image.open(Path(self.code_dir, "AWS_logo_RGB.png"))
expected_file_path = str(Path(self.code_dir, "AWS_logo_RGB.png"))

with open(expected_file_path, mode="rb") as file:
expected_file_content = file.read()
expected_hash = hashlib.sha1(expected_file_content).hexdigest()

if 200 <= status <= 299:
actual = Image.open(BytesIO(response.content))
self.assertEqual(expected, actual)
actual_hash = hashlib.sha1(response.content).hexdigest()
self.assertEqual(expected_hash, actual_hash)

self.assertEqual(status, expected_status_code, " must return HTTP " + str(expected_status_code))

Expand Down
1 change: 0 additions & 1 deletion requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ parameterized~=0.7.4
pathlib2>=2.3.5; python_version < '3'
click~=7.1
dateparser~=0.7
pillow~=6.2.2
boto3~=1.17

# Requirements for examples
Expand Down