Skip to content
Snippets Groups Projects
Commit e9bcae7d authored by Robert Habermann's avatar Robert Habermann
Browse files

fixes

parent 8ff99367
No related branches found
No related tags found
No related merge requests found
......@@ -25,8 +25,7 @@ from requests.packages.urllib3 import disable_warnings
### turn of plattform insecurity warnings from urllib3
disable_warnings()
LOGGER_NAME = "log"
logger = logging.getLogger(LOGGER_NAME)
logger = logging.getLogger(__name__)
### path to certificate bundle and set to environment
#ca_certs = os.path.join(os.path.dirname(os.path.realpath(__file__)), os.pardir) + "/LufthansaCA.crt"
......@@ -47,7 +46,7 @@ class PyOTRS(object):
username=None,
password=None,
session_id=None,
session_id_file="log/.session_id.tmp",
session_id_file="/tmp/.session_id.tmp",
https_verify=True):
self.logger = logger
......@@ -154,11 +153,11 @@ class PyOTRS(object):
try:
self.data = requests.post(url, params=payload, proxies=proxies, verify=self.https_verify)
self.data_json = json.loads(self.data.content)
self.data_json = json.loads(self.data.content.decode())
self.session_id = self.data_json['SessionID']
return True
except requests.exceptions.RequestException as e:
print e
print(e)
sys.exit(1)
......
......@@ -4,6 +4,7 @@ envlist = cov_clean, py27, py34, cov_report, py3kwarn, pep8
[testenv]
deps = coverage
mock
commands = coverage run -a setup.py test
# --------------------------------------------------------------------
......@@ -30,7 +31,7 @@ commands = bash -c "if [ ! -d .coverage.data ]; then mkdir .coverage.data; fi"
mv {toxinidir}/.coverage {toxinidir}/.coverage.data/.coverage.{envname}
[testenv:cov_report]
commands = coverage combine .coverage_data
commands = coverage combine .coverage.data
coverage html -d htmlcov
# --------------------------------------------------------------------
......
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