From 1dc5ebda3219beddea2e9df1d47fd1a5047ea84e Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 23 Sep 2015 12:48:13 +0530
Subject: [PATCH] [fix] test runner fixes

---
 frappe/model/document.py | 5 ++---
 frappe/test_runner.py    | 9 ++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index 2ed431d668..7f78f607ca 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -58,6 +58,8 @@ class Document(BaseDocument):
 		all values (including child documents) from the database.
 		"""
 		self.doctype = self.name = None
+		self._default_new_docs = {}
+		self.flags = frappe._dict()
 
 		if arg1 and isinstance(arg1, basestring):
 			if not arg2:
@@ -83,9 +85,6 @@ class Document(BaseDocument):
 			# incorrect arguments. let's not proceed.
 			raise frappe.DataError("Document({0}, {1})".format(arg1, arg2))
 
-		self._default_new_docs = {}
-		self.flags = frappe._dict()
-
 	def reload(self):
 		"""Reload document from database"""
 		self.load_from_db()
diff --git a/frappe/test_runner.py b/frappe/test_runner.py
index 5a93d36c07..3f00535f6d 100644
--- a/frappe/test_runner.py
+++ b/frappe/test_runner.py
@@ -231,9 +231,9 @@ def make_test_objects(doctype, test_records, verbose=None):
 		docstatus = d.docstatus
 
 		d.docstatus = 0
-		d.run_method("before_test_insert")
 
 		try:
+			d.run_method("before_test_insert")
 			d.insert()
 
 			if docstatus == 1:
@@ -241,6 +241,13 @@ def make_test_objects(doctype, test_records, verbose=None):
 		except frappe.NameError:
 			pass
 
+		except Exception, e:
+			if d.flags.ignore_these_exceptions_in_test and e.__class__ in d.flags.ignore_these_exceptions_in_test:
+				pass
+
+			else:
+				raise
+
 		records.append(d.name)
 
 	frappe.db.commit()