Test case fixed

frappe/defaults.py

@@ -108,7 +108,7 @@ def set_default(key, value, parent, parenttype="__default"):
 	:param parent: Usually, **User** to whom the default belongs.
 	:param parenttype: [optional] default is `__default`."""
 	frappe.db.sql("""delete from `tabDefaultValue` where defkey=%s and parent=%s""", (key, parent))
-	if value:
+	if value != None:
 		add_default(key, value, parent)
 
 def add_default(key, value, parent, parenttype=None):

frappe/email/smtp.py

@@ -66,7 +66,8 @@ def get_outgoing_email_account(raise_exception_not_set=True, append_to=None):
 				frappe.OutgoingEmailError)
 
 		if email_account:
-			email_account.password = email_account.get_password()
+			if email_account.enable_outgoing:
+				email_account.password = email_account.get_password()
 			email_account.default_sender = email.utils.formataddr((email_account.name, email_account.get("email_id")))
 
 		frappe.local.outgoing_email_account[append_to or "default"] = email_account

frappe/tests/test_data_import.py

@@ -51,8 +51,9 @@ class TestDataImport(unittest.TestCase):
 		user_email = "test_import_userrole@example.com"
 		if frappe.db.exists("User", user_email):
 			frappe.delete_doc("User", user_email)
-
-		frappe.get_doc({"doctype": "User", "email": user_email, "first_name": "Test Import UserRole"}).insert()
+		
+		frappe.get_doc({"doctype": "User", "email": user_email, 
+			"first_name": "Test Import UserRole"}).insert()
 
 		exporter.get_template("UserRole", "User", all_doctypes="No", with_data="No")
 		content = read_csv_content(frappe.response.result)
@@ -60,7 +61,7 @@ class TestDataImport(unittest.TestCase):
 		importer.upload(content)
 
 		user = frappe.get_doc("User", user_email)
-		self.assertEquals(len(user.get("user_roles")), 1)
+		self.assertTrue(frappe.db.get_value("UserRole", filters={"role": "Blogger", "parent": user_email}))
 		self.assertTrue(user.get("user_roles")[0].role, "Blogger")
 
 		# overwrite