Merge "remove useless looping in pipeline"

ceilometer/pipeline.py

@@ -18,8 +18,6 @@
 # under the License.
 
 import fnmatch
-import itertools
-import operator
 import os
 
 from oslo.config import cfg
@@ -312,10 +310,7 @@ class Sink(object):
                                                       'pub': p}))
 
     def publish_samples(self, ctxt, samples):
-        for meter_name, samples in itertools.groupby(
-                sorted(samples, key=operator.attrgetter('name')),
-                operator.attrgetter('name')):
-            self._publish_samples(0, ctxt, samples)
+        self._publish_samples(0, ctxt, samples)
 
     def flush(self, ctxt):
         """Flush data after all samples have been injected to pipeline."""

ceilometer/tests/pipeline_base.py

@@ -869,11 +869,11 @@ class BasePipelineTestCase(base.BaseTestCase):
         pipe.publish_samples(None, counters)
         publisher = pipeline_manager.pipelines[0].publishers[0]
         self.assertEqual(2, len(publisher.samples))
-        core_temp = publisher.samples[1]
+        core_temp = publisher.samples[0]
         self.assertEqual('core_temperature', getattr(core_temp, 'name'))
         self.assertEqual('°F', getattr(core_temp, 'unit'))
         self.assertEqual(96.8, getattr(core_temp, 'volume'))
-        amb_temp = publisher.samples[0]
+        amb_temp = publisher.samples[1]
         self.assertEqual('ambient_temperature', getattr(amb_temp, 'name'))
         self.assertEqual('°F', getattr(amb_temp, 'unit'))
         self.assertEqual(88.8, getattr(amb_temp, 'volume'))