caminus/caminus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests and other rubbish

Browse Source
This commit is contained in:
Trever Fischer
2012-06-10 23:20:45 -04:00
parent 96643e1ab9
commit 5b0601ea7f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/handlers.py
View File

@@ -30,10 +30,10 @@ class NewPlayerSessionHandler(BaseHandler):
try:
profile = MinecraftProfile.objects.all().filter(mc_username__iexact=playername)[0]
except IndexError, e:
return {'valid': False, 'error': 'User not found', 'permissions': []}
return {'success': False, 'error': 'User not found', 'permissions': []}
if profile.user.is_active:
if profile.isBanned():
return {'valid': False, 'error': 'Your account is banned.', 'permissions': []}
return {'success': False, 'error': 'Your account is banned.', 'permissions': []}
ip = request.POST['ip']
server = request.server
profile = MinecraftProfile.objects.get(mc_username__exact=playername)

8
api/tests.py
View File

@@ -74,13 +74,13 @@ class SessionTest(unittest.TestCase):
b.delete()
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
self.assertFalse(session['valid'])
self.assertFalse(session['success'])
def testBadUserStart(self):
resp = self.client.post('/api/server/session/SomeUnknownUser/new', {'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
self.assertFalse(session['valid'])
self.assertFalse(session['success'])
def testInactiveStart(self):
self.user.is_active = False
@@ -90,13 +90,13 @@ class SessionTest(unittest.TestCase):
self.user.save()
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
self.assertFalse(session['valid'])
self.assertFalse(session['success'])
def testSessionStart(self):
resp = self.client.post('/api/server/session/%s/new'%(self.user.minecraftprofile.mc_username), {'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
self.assertTrue(session['valid'])
self.assertTrue(session['success'])
def testSessionEnd(self):
resp = self.client.post('/api/server/session/%s/new'%(self.user.minecraftprofile.mc_username), {'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))