Merge "Drop redundant if-else block"

osprofiler/profiler.py

@@ -168,10 +168,7 @@ def trace(name, info=None, hide_args=False, hide_result=True,
                     stop_info = {"function": {"result": repr(result)}}
                 return result
             finally:
-                if stop_info:
-                    stop(info=stop_info)
-                else:
-                    stop()
+                stop(info=stop_info)
 
         return wrapper
 
@@ -345,14 +342,13 @@ class Trace(object):
         start(self._name, info=self._info)
 
     def __exit__(self, etype, value, traceback):
+        info = None
         if etype:
             info = {
                 "etype": reflection.get_class_name(etype),
                 "message": value.args[0] if value.args else None
             }
-            stop(info=info)
-        else:
-            stop()
+        stop(info=info)
 
 
 class _Profiler(object):

osprofiler/tests/unit/test_profiler.py

@@ -166,9 +166,9 @@ class WithTraceTestCase(test.TestCase):
             mock_start.reset_mock()
             with profiler.Trace("b", info="b1"):
                 mock_start.assert_called_once_with("b", info="b1")
-            mock_stop.assert_called_once_with()
+            mock_stop.assert_called_once_with(info=None)
             mock_stop.reset_mock()
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -234,7 +234,7 @@ class TraceDecoratorTestCase(test.TestCase):
             }
         }
         mock_start.assert_called_once_with("function", info=expected_info)
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -247,7 +247,7 @@ class TraceDecoratorTestCase(test.TestCase):
             }
         }
         mock_start.assert_called_once_with("hide_args", info=expected_info)
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -375,7 +375,7 @@ class TraceClsDecoratorTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("rpc", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -394,7 +394,7 @@ class TraceClsDecoratorTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("rpc", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -420,7 +420,7 @@ class TraceClsDecoratorTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("a", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -440,7 +440,7 @@ class TraceClsDecoratorTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("rpc", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -471,7 +471,7 @@ class TraceClsDecoratorTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("rpc", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -553,7 +553,7 @@ class TraceWithMetaclassTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("rpc", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -572,7 +572,7 @@ class TraceWithMetaclassTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("rpc", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -598,7 +598,7 @@ class TraceWithMetaclassTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("a", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)
 
     @mock.patch("osprofiler.profiler.stop")
     @mock.patch("osprofiler.profiler.start")
@@ -618,4 +618,4 @@ class TraceWithMetaclassTestCase(test.TestCase):
         self.assertEqual(1, len(mock_start.call_args_list))
         self.assertIn(mock_start.call_args_list[0],
                       possible_mock_calls("rpc", expected_info))
-        mock_stop.assert_called_once_with()
+        mock_stop.assert_called_once_with(info=None)