Skip to content
Snippets Groups Projects
Commit 00ade570 authored by Roy de Goei's avatar Roy de Goei Committed by Jorrit Schaap
Browse files

TMSS-178: Remove merge comment and fixed merge conflict

parent d3f9f6e5
No related branches found
No related tags found
1 merge request!124Resolve TMSS-178
Hide whitespace changes
Inline Side-by-side
SAS/TMSS/test/tmss_test_environment_unittest_setup.py
+ 0
− 4
View file @ 00ade570
...@@ -71,13 +71,9 @@ def _call_API_and_assert_expected_response(test_instance, url, call, data, expec ...@@ -71,13 +71,9 @@ def _call_API_and_assert_expected_response(test_instance, url, call, data, expec
content = response.content.decode('utf-8') content = response.content.decode('utf-8')
<<<<<<< Updated upstream
if response.status_code in range(200, 300):
=======
from django.db import models from django.db import models
if response.status_code in range(200, 300) and expected_content is not None: if response.status_code in range(200, 300) and expected_content is not None:
>>>>>>> Stashed changes
r_dict = json.loads(content) r_dict = json.loads(content)
for key, value in expected_content.items(): for key, value in expected_content.items():
if key not in r_dict.keys(): if key not in r_dict.keys():
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment