Merge remote-tracking branch 'origin/master' into offline

# Conflicts:
#	configcatclient/utils.py
#	configcatclienttests/test_utils.py

Author: kp-cat

configcatclienttests/test_utils.py

@@ -6,6 +6,22 @@
 logging.basicConfig(level=logging.INFO)
 
 
+def no_operation():
+    pass
+
+
+def test_method_is_called_from():
+    pass
+
+
+class OtherClass(object):
+    def no_operation(self):
+        pass
+
+    def test_method_is_called_from(self):
+        pass
+
+
 class UtilsTests(unittest.TestCase):
     def no_operation(self):
         pass
@@ -21,9 +37,15 @@ def object_method(self, method):
 
         self.assertTrue(TestClass.class_method(UtilsTests.test_method_is_called_from))
         self.assertTrue(TestClass().object_method(UtilsTests.test_method_is_called_from))
+
         self.assertFalse(TestClass.class_method(UtilsTests.no_operation))
         self.assertFalse(TestClass().object_method(UtilsTests.no_operation))
 
+        self.assertFalse(TestClass.class_method(no_operation))
+        self.assertFalse(TestClass().object_method(test_method_is_called_from))
+        self.assertFalse(TestClass.class_method(OtherClass.no_operation))
+        self.assertFalse(TestClass().object_method(OtherClass.test_method_is_called_from))
+
 
 if __name__ == '__main__':
     unittest.main()