Skip to content
Snippets Groups Projects
Commit 84255891 authored by Jörn Künsemöller's avatar Jörn Künsemöller
Browse files

TMSS-453: remove broken workaround for localhost/127.0.0.1 issue with TMSSsession and fix test

parent 4f9bf137
No related branches found
No related tags found
3 merge requests!634WIP: COBALT commissioning delta,!481Draft: SW-971 SW-973 SW-975: Various fixes to build LOFAR correctly.,!476Resolve TMSS-453
...@@ -115,9 +115,8 @@ class OIDCSession(unittest.TestCase): ...@@ -115,9 +115,8 @@ class OIDCSession(unittest.TestCase):
password = os.environ.get('OIDC_PASSWORD', AUTH.password) password = os.environ.get('OIDC_PASSWORD', AUTH.password)
with TMSSsession(username, password, urllib.parse.urlparse(BASE_URL).hostname, urllib.parse.urlparse(BASE_URL).port) as tmss_session: with TMSSsession(username, password, urllib.parse.urlparse(BASE_URL).hostname, urllib.parse.urlparse(BASE_URL).port) as tmss_session:
r = tmss_session.session.get(BASE_URL + '/task_draft/') r = tmss_session.session.get(BASE_URL + '/task_draft/')
logger.info(r.content.decode('utf8'))
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
self.assertTrue("Task Draft List" in r.content.decode('utf8')) self.assertIn('results', r.json())
class TokenAuthTestCase(unittest.TestCase): class TokenAuthTestCase(unittest.TestCase):
......
...@@ -107,10 +107,6 @@ class TMSSsession(object): ...@@ -107,10 +107,6 @@ class TMSSsession(object):
for resp in response.history: for resp in response.history:
logger.info("via %s: %s" % (resp.status_code, resp.url)) logger.info("via %s: %s" % (resp.status_code, resp.url))
logger.info("got %s: %s" % (response.status_code, response.url)) logger.info("got %s: %s" % (response.status_code, response.url))
# todo: remove this ugly fix once we have a production url:
if response.status_code == 400 and "127.0.0.1" in response.url:
response = self.session.get(response.url.replace('127.0.0.1', 'localhost'))
logger.info("fix %s: %s" % (response.status_code, response.url))
# post user credentials to login page, also pass csrf token if present # post user credentials to login page, also pass csrf token if present
if 'csrftoken' in self.session.cookies: if 'csrftoken' in self.session.cookies:
# Mozilla OIDC provider # Mozilla OIDC provider
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment