openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Monotonic flag sets incorrectly in rangelib"

This commit is contained in:
Tianjie Xu 2016-04-13 21:48:53 +00:00 committed by Gerrit Code Review
parent dea8b94f98 cd1e16a761
commit 323e3d4c18
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/rangelib.py
View File

@ -104,7 +104,7 @@ class RangeSet(object):
if last <= s: if last <= s:
last = s+1 last = s+1
else: else:
monotonic = True monotonic = False
data.sort() data.sort()
self.data = tuple(self._remove_pairs(data)) self.data = tuple(self._remove_pairs(data))
self.monotonic = monotonic self.monotonic = monotonic

1
tools/releasetools/test_rangelib.py
View File

@ -117,6 +117,7 @@ class RangeSetTest(unittest.TestCase):
self.assertTrue(RangeSet("").monotonic) self.assertTrue(RangeSet("").monotonic)
self.assertTrue(RangeSet("0-4 5-9").monotonic) self.assertTrue(RangeSet("0-4 5-9").monotonic)
self.assertFalse(RangeSet("5-9 0-4").monotonic) self.assertFalse(RangeSet("5-9 0-4").monotonic)
self.assertFalse(RangeSet("258768-259211 196604").monotonic)
self.assertTrue(RangeSet(data=[0, 10]).monotonic) self.assertTrue(RangeSet(data=[0, 10]).monotonic)
self.assertTrue(RangeSet(data=[0, 10, 15, 20]).monotonic) self.assertTrue(RangeSet(data=[0, 10, 15, 20]).monotonic)