[2222] simplified complicated assignment of `incrementer`

diff --git a/src/bin/xfrout/tests/xfrout_test.py.in b/src/bin/xfrout/tests/xfrout_test.py.in
index c519b906b86f31101b5ecb10066cdbfa03af0291..f38a9cd15b62d7c2a28445a79dd3c212dae627f2 100644 (file)
--- a/src/bin/xfrout/tests/xfrout_test.py.in
+++ b/src/bin/xfrout/tests/xfrout_test.py.in
@@ -1650,10 +1650,16 @@ class TestXfroutCounter(unittest.TestCase):
         result = { XfroutCounter.entire_server: {},
                    TEST_ZONE_NAME_STR: {} }
         for counter_name in self._counters:
-            incrementer = \
-                dict(self.xfrout_counter.get_counters_for_xfroutsession(), \
-                         **self.xfrout_counter.get_counters_for_notifyout())\
-                         ['counter_%s' % counter_name]
+            cntrs_xfrss = \
+                self.xfrout_counter.get_counters_for_xfroutsession()
+            cntrs_notfy = \
+                self.xfrout_counter.get_counters_for_notifyout()
+            cnt_name = 'counter_%s' % counter_name
+            incrementer = None
+            if cnt_name in cntrs_xfrss:
+                incrementer = cntrs_xfrss[cnt_name]
+            else:
+                incrementer = cntrs_notfy[cnt_name]
             self.start_incrementer(incrementer, TEST_ZONE_NAME_STR)
             self.assertEqual(self.get_count(\
                         TEST_ZONE_NAME_STR, counter_name), \