Merge 6aaa8bc into c2ea8df

facebook · Feb 24, 2021 · fdcb13c · fdcb13c
2 parents c2ea8df + 6aaa8bc
commit fdcb13c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/tests/strict_mock_testslide.py b/tests/strict_mock_testslide.py
@@ -118,7 +118,6 @@ def __hash__(self):
 class TemplateBaseStrictMock(StrictMock):
     def __init__(self):
         super().__init__(template=Template)
-        self.__instance_method_return = "mock"
 
     @staticmethod
     def static_method(message):
@@ -130,6 +129,7 @@ def __len__(self):
 
 class TemplateStrictMock(TemplateBaseStrictMock):
     def instance_method(self, message):
+        self.__instance_method_return = "mock"
         return self.__instance_method_return
 
 

diff --git a/testslide/strict_mock.py b/testslide/strict_mock.py
@@ -626,9 +626,10 @@ def __validate_attribute_type(self, name: str, value: Any) -> None:
     def __validate_and_wrap_mock_value(self, name: str, value: Any) -> Any:
         if self._template:
             if not self.__template_has_attr(name):
-                if not (name.startswith(f"_{type(self).__name__}__") and not name.endswith(
-                    "__"
-                )):
+                if not (
+                    name.startswith(f"_{type(self).__name__}__")
+                    and not name.endswith("__")
+                ):
                     raise NonExistentAttribute(self, name)
 
             self.__validate_attribute_type(name, value)