Merge "Monotonic flag sets incorrectly in rangelib"

am: 323e3d4

* commit '323e3d4c188b7da2839ca70834d893bfd92d7b3a':
  Monotonic flag sets incorrectly in rangelib

Change-Id: I592f61c1069293539df958b26043e29149eb4dda
This commit is contained in:
Tianjie Xu
2016-04-13 22:02:46 +00:00
committed by android-build-merger
2 changed files with 2 additions and 1 deletions

View File

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

View File

@@ -117,6 +117,7 @@ class RangeSetTest(unittest.TestCase):
self.assertTrue(RangeSet("").monotonic)
self.assertTrue(RangeSet("0-4 5-9").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, 15, 20]).monotonic)