first tests passing

server/requirements.tx

@@ -1,3 +1,3 @@
 webdb
 cherrypy
-
+pytest

server/server/registration.py

@@ -13,7 +13,7 @@ class RegistrationServer(object):
 		return open(self.conf["register"]["index"])
 
 	@cherrypy.expose
-	@cherrypy.tools.json_in
+	@cherrypy.tools.json_in()
 	def do_register(self):
 
 		if(not self.conf["register"]["enabled"]):
@@ -37,7 +37,7 @@ class RegistrationServer(object):
 				"email, first_name, last_name) "\
 				"VALUES(?, ?, ?, ?, ?)",
 				[username, passwd_hash, data["email"],
-				data["first_name"], data["last_name"])
+				data["first_name"], data["last_name"]])
 
 		db.commit()
 		db.close()

server/test/test_registration.py

@@ -1,4 +1,6 @@
+import os
 from hashlib import sha256
+import sqlite3
 
 
 from server.registration import RegistrationServer
@@ -40,7 +42,7 @@ def build_dir(directory):
 
 		cursor.execute("CREATE TABLE confirmations_awaiting(" \
 				"user_id integer, " \
-				"convirmation_id integer PRIMARY KEY AUTOINCREMENT");
+				"convirmation_id integer PRIMARY KEY AUTOINCREMENT)")
 		db.commit()
 
 		cursor.execute("CREATE INDEX username ON users(username)")
@@ -107,11 +109,11 @@ def build_dir(directory):
 	create_private_db(directory)
 	create_public_db(directory)
 
-	with open("index.html", "w") as index:
+	with open(os.path.join(directory, "index.html"), "w") as index:
 		index.write("INDEX")
 
-	return {"database": {"users": directory + "private"},
-		"register": {"index": directory + "index.html",
+	return {"database": {"users": os.path.join(directory, "private")},
+		"register": {"index": os.path.join(directory, "index.html"),
 				"enabled": True}
 	}
 
@@ -125,5 +127,5 @@ def test_registration(tmpdir):
 
 	server = RegistrationServer(conf, mkhash)
 
-	assert server.index() == "INDEX"
+	assert server.index().read() == "INDEX"