summaryrefslogtreecommitdiffstats
path: root/tests/test_json.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_json.py')
-rw-r--r--tests/test_json.py41
1 files changed, 24 insertions, 17 deletions
diff --git a/tests/test_json.py b/tests/test_json.py
index ff56e8f5a..de2914182 100644
--- a/tests/test_json.py
+++ b/tests/test_json.py
@@ -1,48 +1,55 @@
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
-from urllib import urlencode
-from urllib2 import urlopen, HTTPError
-from json import loads
+import json
+import logging
+import urllib
+import urllib2
-from logging import log
url = "http://localhost:8001/api/%s"
-class TestJson:
+
+class TestJson(object):
def call(self, name, post=None):
if not post: post = {}
- post["session"] = self.key
- u = urlopen(url % name, data=urlencode(post))
- return loads(u.read())
+ post['session'] = self.key
+ u = urllib2.urlopen(url % name, data=urlencode(post))
+ return json.loads(u.read())
+
def setUp(self):
- u = urlopen(url % "login", data=urlencode({"username": "TestUser", "password": "pwhere"}))
- self.key = loads(u.read())
+ u = urllib2.urlopen(url % "login", data=urlencode({"username": "TestUser", "password": "pwhere"}))
+ self.key = json.loads(u.read())
assert self.key is not False
+
def test_wronglogin(self):
- u = urlopen(url % "login", data=urlencode({"username": "crap", "password": "wrongpw"}))
- assert loads(u.read()) is False
+ u = urllib2.urlopen(url % "login", data=urlencode({"username": "crap", "password": "wrongpw"}))
+ assert json.loads(u.read()) is False
+
def test_access(self):
try:
- urlopen(url % "getServerVersion")
- except HTTPError, e:
+ urllib2.urlopen(url % "getServerVersion")
+ except urllib2.HTTPError, e:
assert e.code == 403
else:
assert False
+
def test_status(self):
ret = self.call("statusServer")
- log(1, str(ret))
+ logging.log(1, str(ret))
assert "pause" in ret
assert "queue" in ret
+
def test_unknown_method(self):
try:
self.call("notExisting")
- except HTTPError, e:
+ except urllib2.HTTPError, e:
assert e.code == 404
else:
- assert False \ No newline at end of file
+ assert False