[minor] don't rollback when running all tests, fixed test cases

core/doctype/profile/profile.py

@@ -216,7 +216,7 @@ Thank you,<br>
 				
 		# disable the user and log him/her out
 		self.doc.enabled = 0
-		if webnotes.local.login_manager:
+		if getattr(webnotes.local, "login_manager", None):
 			webnotes.local.login_manager.logout(user=self.doc.name)
 		
 		# delete their password

core/doctype/profile/test_profile.py

@@ -7,9 +7,9 @@ from webnotes.model.utils import delete_doc, LinkExistsError
 
 class TestProfile(unittest.TestCase):
 	def test_delete(self):
-		self.assertRaises(LinkExistsError, delete_doc, "Role", "_Test Role")
-		webnotes.conn.sql("""delete from tabUserRole where role='_Test Role'""")
-		delete_doc("Role","_Test Role")
+		self.assertRaises(LinkExistsError, delete_doc, "Role", "_Test Role 2")
+		webnotes.conn.sql("""delete from tabUserRole where role='_Test Role 2'""")
+		delete_doc("Role","_Test Role 2")
 		
 		profile = webnotes.bean(copy=test_records[1])
 		profile.doc.email = "_test@example.com"
@@ -80,5 +80,20 @@ test_records = [[{
 		"email": "test2@example.com",
 		"first_name": "_Test2",
 		"new_password": "testpassword"
-	}]
+	}],
+	[{
+		"doctype":"Profile",
+		"email": "testdelete@example.com",
+		"first_name": "_Test",
+		"new_password": "testpassword",
+		"enabled": 1
+	}, {
+		"doctype":"UserRole",
+		"parentfield":"user_roles",
+		"role": "_Test Role 2"
+	}, {
+		"doctype":"UserRole",
+		"parentfield":"user_roles",
+		"role": "System Manager"
+	}],
 ]

core/doctype/role/test_role.py

@@ -1,4 +1,4 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
 # MIT License. See license.txt
 
-test_records = [[{"role_name":"_Test Role"}]]
+test_records = [[{"role_name":"_Test Role"}], [{"role_name":"_Test Role 2"}]]

webnotes/db.py

@@ -6,6 +6,7 @@
 
 from __future__ import unicode_literals
 import MySQLdb
+import warnings
 import webnotes
 from webnotes import conf
 import datetime
@@ -42,6 +43,7 @@ class Database:
 		"""
 		      Connect to a database
 		"""
+		warnings.filterwarnings('ignore', category=MySQLdb.Warning)
 		self._conn = MySQLdb.connect(user=self.user, host=self.host, passwd=self.password, 
 			use_unicode=True, charset='utf8')
 		self._conn.converter[246]=float

webnotes/model/utils.py

@@ -200,7 +200,7 @@ def check_if_doc_is_linked(dt, dn, method="Delete"):
 		if not issingle:
 			item = webnotes.conn.get_value(link_dt, {link_field:dn}, 
 				["name", "parent", "parenttype", "docstatus"], as_dict=True)
-		
+			
 			if item and item.parent != dn and (method=="Delete" or 
 					(method=="Cancel" and item.docstatus==1)):
 				webnotes.msgprint(method + " " + _("Error") + ":"+\

webnotes/test_runner.py

@@ -146,26 +146,28 @@ def run_unittest(doctype, verbose=False):
 def run_all_tests(verbose):
 	import os
 
+	test_suite = unittest.TestSuite()
 	for path, folders, files in os.walk("."):
 		# print path
 		for filename in files:
 			filename = cstr(filename)
 			if filename.startswith("test_") and filename.endswith(".py"):
-				print filename[:-3]
-				webnotes.session.user = "Administrator"
-				
-				_run_test(path, filename, verbose)
+				# print filename[:-3]
 				
-				webnotes.conn.rollback()
-				webnotes.test_objects = {}
+				_run_test(path, filename, verbose, test_suite=test_suite, run=False)
 				
-				print
+				# webnotes.conn.rollback()
+				# webnotes.test_objects = {}
 
-def _run_test(path, filename, verbose):
+	unittest.TextTestRunner(verbosity=1+(verbose and 1 or 0)).run(test_suite)
+
+def _run_test(path, filename, verbose, test_suite=None, run=True):
 	import os, imp
 	from webnotes.modules.utils import peval_doclist
 	
-	test_suite = unittest.TestSuite()
+	if not test_suite:
+		test_suite = unittest.TestSuite()
+	
 	if os.path.basename(os.path.dirname(path))=="doctype":
 		txt_file = os.path.join(path, filename[5:].replace(".py", ".txt"))
 		with open(txt_file, 'r') as f:
@@ -175,7 +177,9 @@ def _run_test(path, filename, verbose):
 	
 	module = imp.load_source(filename[:-3], os.path.join(path, filename))
 	test_suite.addTest(unittest.TestLoader().loadTestsFromModule(module))
-	unittest.TextTestRunner(verbosity=1+(verbose and 1 or 0)).run(test_suite)
+	
+	if run:
+		unittest.TextTestRunner(verbosity=1+(verbose and 1 or 0)).run(test_suite)
 
 def main():
 	import argparse

webnotes/tests/test_db.py

@@ -9,7 +9,7 @@ from webnotes.test_runner import make_test_records
 class TestDB(unittest.TestCase):
 	def test_get_value(self):
 		webnotes.conn.sql("""delete from `tabProfile` where name not in ('Administrator', 'Guest')""")
-		
+		del webnotes.test_objects["Profile"]
 		make_test_records("Profile")
 		
 		self.assertEquals(webnotes.conn.get_value("Profile", {"name": ["=", "Administrator"]}), "Administrator")

webnotes/tests/test_email.py

@@ -25,6 +25,7 @@ class TestEmail(unittest.TestCase):
 	def test_bulk(self):
 		from webnotes.utils.email_lib.bulk import send
 		send(recipients = ['test@example.com', 'test1@example.com'], 
+			sender="admin@example.com",
 			doctype='Profile', email_field='email',
 			subject='Testing Bulk', message='This is a bulk mail!')
 		
@@ -45,7 +46,7 @@ class TestEmail(unittest.TestCase):
 		
 	def test_unsubscribe(self):
 		from webnotes.utils.email_lib.bulk import unsubscribe, send
-		webnotes.form_dict = {
+		webnotes.local.form_dict = {
 			'email':'test@example.com',
 			'type':'Profile',
 			'email_field':'email',
@@ -54,6 +55,7 @@ class TestEmail(unittest.TestCase):
 		unsubscribe()
 
 		send(recipients = ['test@example.com', 'test1@example.com'], 
+			sender="admin@example.com",
 			doctype='Profile', email_field='email', 
 			subject='Testing Bulk', message='This is a bulk mail!')
 		
@@ -67,7 +69,8 @@ class TestEmail(unittest.TestCase):
 	def test_bulk_limit(self):
 		from webnotes.utils.email_lib.bulk import unsubscribe, send, BulkLimitCrossedError
 		self.assertRaises(BulkLimitCrossedError, send,
-			recipients=['test@example.com']*1000, 
+			recipients=['test@example.com']*1000,
+			sender="admin@example.com",
 			doctype='Profile', email_field='email',
 			subject='Testing Bulk', message='This is a bulk mail!')
 		

webnotes/utils/__init__.py

@@ -820,14 +820,14 @@ def get_base_path():
 	return os.path.dirname(os.path.abspath(conf.__file__))
 	
 def get_site_base_path(sites_dir=None, hostname=None):
-	if conf and not conf.sites_dir:
-		return get_base_path()
-	
 	if not sites_dir:
 		sites_dir = conf.sites_dir
 	
 	if not hostname:
 		hostname = conf.site
+		
+	if not (sites_dir and hostname):
+		return get_base_path()
 
 	import os
 	return os.path.join(sites_dir, hostname)

webnotes/utils/email_lib/bulk.py

@@ -45,7 +45,7 @@ def send(recipients=None, sender=None, doctype='Profile', email_field='email',
 			}))
 			
 		return updated
-			
+	
 	if not recipients: recipients = []
 	if not sender or sender == "Administrator":
 		sender = webnotes.conn.get_value('Email Settings', None, 'auto_email_id')
@@ -79,7 +79,7 @@ def add(email, sender, subject, message, text_content=None, ref_doctype=None, re
 	try:
 		e.message = get_email(email, sender=e.sender, msg=message, subject=subject, 
 			text_content = text_content).as_string()
-	except webnotes.ValidationError, e:
+	except webnotes.ValidationError:
 		# bad email id - don't add to queue
 		return