openstack/rally
Code Issues Proposed changes

Merge "Remove AtomicMerger which is unused"

Browse Source
This commit is contained in:
Jenkins 2017-10-13 14:18:00 +00:00 committed by Gerrit Code Review
commit 9dbf5e550e
2 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rally/task/processing/utils.py
View File

@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import collections
class GraphZipper(object):
@ -77,31 +75,3 @@ class GraphZipper(object):
def get_zipped_graph(self):
return self.zipped_graph
class AtomicMerger(object):
def __init__(self, atomic):
self._atomic = atomic
self._merge_name = lambda x, y: "%s (x%d)" % (x, y) if y > 1 else x
def get_merged_names(self):
return [self._merge_name(key, value.get("count", 1))
for key, value in self._atomic.items()]
def get_merged_name(self, name):
return self._merge_name(name, self._atomic[name].get("count", 1))
def merge_atomic_actions(self, atomic_actions):
new_atomic_actions = collections.OrderedDict()
for name in self._atomic.keys():
count = 0
duration = 0
for action in atomic_actions:
if action["name"] == name:
duration += action["finished_at"] - action["started_at"]
count += 1
if count == self._atomic[name].get("count", 1):
new_name = self._merge_name(name, count)
new_atomic_actions[new_name] = duration
return new_atomic_actions

48
tests/unit/task/processing/test_utils.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import collections
import ddt
from rally.task.processing import utils
@ -48,50 +47,3 @@ class GraphZipperTestCase(test.TestCase):
self.assertRaises(TypeError, merger.add_point)
[merger.add_point(1) for value in range(10)]
self.assertRaises(RuntimeError, merger.add_point, 1)
class AtomicMergerTestCase(test.TestCase):
def setUp(self):
super(AtomicMergerTestCase, self).setUp()
self.atomic = collections.OrderedDict([("foo", {"count": 1}),
("bar", {"count": 2})])
def test_get_merged_names(self):
atomic_merger = utils.AtomicMerger(self.atomic)
self.assertEqual(["foo", "bar (x2)"],
atomic_merger.get_merged_names())
def test_get_merged_name(self):
atomic_merger = utils.AtomicMerger(self.atomic)
self.assertEqual("foo", atomic_merger.get_merged_name("foo"))
self.assertEqual("bar (x2)", atomic_merger.get_merged_name("bar"))
def test_merge_atomic_actions(self):
atomic_merger = utils.AtomicMerger(self.atomic)
atomic_actions = [{"name": "foo",
"started_at": 0,
"finished_at": 1.1}]
self.assertEqual(collections.OrderedDict([("foo", 1.1)]),
atomic_merger.merge_atomic_actions(atomic_actions))
atomic_actions = [{"name": "foo",
"started_at": 0,
"finished_at": 1.1},
{"name": "bar",
"started_at": 1.1,
"finished_at": 2.3}]
self.assertEqual(collections.OrderedDict([("foo", 1.1)]),
atomic_merger.merge_atomic_actions(atomic_actions))
atomic_actions = [{"name": "foo",
"started_at": 0,
"finished_at": 1.1},
{"name": "bar",
"started_at": 1.1,
"finished_at": 2.3},
{"name": "bar",
"started_at": 2.3,
"finished_at": 3.5}]
self.assertEqual(collections.OrderedDict([("foo", 1.1),
("bar (x2)", 2.4)]),
atomic_merger.merge_atomic_actions(atomic_actions))