From 1ff0bbf6c64e0b940e9d44faebddc1b25178a89b Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 1 Mar 2022 11:49:44 +0530
Subject: [PATCH] test(fix): Add cleanup for test_doc_rename_method

---
 frappe/tests/test_rename_doc.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py
index f02a43a83d..2a4a3805f7 100644
--- a/frappe/tests/test_rename_doc.py
+++ b/frappe/tests/test_rename_doc.py
@@ -48,14 +48,6 @@ class TestRenameDoc(unittest.TestCase):
 		# data generation: for base and merge tests
 		self.available_documents = []
 		self.test_doctype = "ToDo"
-		self.property_setter = frappe.get_doc({
-			"doctype":"Property Setter",
-			"doctype_or_field": "DocType",
-			"doc_type": self.test_doctype,
-			"property": "allow_rename",
-			"property_type": "Check",
-			"value": "1",
-		}).insert()
 
 		for num in range(1, 5):
 			doc = frappe.get_doc({
@@ -93,7 +85,6 @@ class TestRenameDoc(unittest.TestCase):
 		# delete the documents created
 		for docname in self.available_documents:
 			frappe.delete_doc(self.test_doctype, docname)
-		self.property_setter.delete()
 
 		for dt in self.doctype.values():
 			if frappe.db.exists("DocType", dt):
@@ -107,8 +98,23 @@ class TestRenameDoc(unittest.TestCase):
 
 	def setUp(self):
 		frappe.flags.link_fields = {}
+		if self._testMethodName == "test_doc_rename_method":
+			self.property_setter = frappe.get_doc({
+				"doctype":"Property Setter",
+				"doctype_or_field": "DocType",
+				"doc_type": self.test_doctype,
+				"property": "allow_rename",
+				"property_type": "Check",
+				"value": "1",
+			}).insert()
+
 		super().setUp()
 
+	def tearDown(self) -> None:
+		if self._testMethodName == "test_doc_rename_method":
+			self.property_setter.delete()
+		return super().tearDown()
+
 	def test_rename_doc(self):
 		"""Rename an existing document via frappe.rename_doc"""
 		old_name = choice(self.available_documents)
@@ -247,9 +253,11 @@ class TestRenameDoc(unittest.TestCase):
 			update_linked_doctypes("User", "ToDo", "str", "str")
 			self.assertTrue("Function frappe.model.rename_doc.update_linked_doctypes" in stdout.getvalue())
 
-	def test_doc_rename(self):
+	def test_doc_rename_method(self):
 		name = choice(self.available_documents)
 		new_name = f"{name}-{frappe.generate_hash(length=4)}"
 		doc = frappe.get_doc(self.test_doctype, name)
 		doc.rename(new_name, merge=frappe.db.exists(self.test_doctype, new_name))
 		self.assertEqual(doc.name, new_name)
+		self.available_documents.append(new_name)
+		self.available_documents.remove(name)