From 52ea4bd5791bc30d67d948bf85408c5728c6e9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Ils=C3=B8?= Date: Tue, 15 Sep 2015 18:32:21 +0200 Subject: [PATCH] Fixed comparison --- rtcFunctions.py | 2 +- tests/test_rtcFunctions.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rtcFunctions.py b/rtcFunctions.py index c2ad1cb..1b0e8ea 100644 --- a/rtcFunctions.py +++ b/rtcFunctions.py @@ -275,7 +275,7 @@ def is_user_aborting(change): def getnextchangeset(currentchangeentry, changeentries): nextchangeentry = None nextindex = changeentries.index(currentchangeentry) + 1 - has_next_changeset = nextindex is not len(changeentries) + has_next_changeset = not (nextindex == len(changeentries)) if has_next_changeset: nextchangeentry = changeentries[nextindex] return nextchangeentry diff --git a/tests/test_rtcFunctions.py b/tests/test_rtcFunctions.py index 1f7081f..24f8d76 100644 --- a/tests/test_rtcFunctions.py +++ b/tests/test_rtcFunctions.py @@ -120,6 +120,14 @@ def test_collectChangeSetsToAcceptToAvoidMergeConflict_ShouldAdhereToMaxChangeSe self.assertFalse(change3 in collectedchanges) self.assertEqual(2, len(collectedchanges)) + def test_collectChangeSetsToAcceptToAvoidMergeConflict_ShouldAcceptLargeAmountOfChangeSets(self): + changeentries = [self.createChangeEntry(str(i)) for i in range(1, 500)] + change1 = changeentries[0] + + configuration.config = self.configBuilder.build() + collectedchanges = ImportHandler().collect_changes_to_accept_to_avoid_conflicts(change1, changeentries, 500) + self.assertEqual(499, len(collectedchanges)) + @patch('builtins.input', return_value='Y') def test_useragreeing_answeris_y_expecttrue(self, inputmock): configuration.config = self.configBuilder.build()