pykolab/itip tests/unit
Thomas Brüderli
bruederli at kolabsys.com
Mon Mar 9 15:54:12 CET 2015
pykolab/itip/__init__.py | 2 +-
tests/unit/test-011-itip.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6f68887acae9fb817c59a707029f01562162e4aa
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Mon Mar 9 10:53:46 2015 -0400
Fix date conflict check (#4767)
diff --git a/pykolab/itip/__init__.py b/pykolab/itip/__init__.py
index 83c9fe1..eda4f04 100644
--- a/pykolab/itip/__init__.py
+++ b/pykolab/itip/__init__.py
@@ -234,7 +234,7 @@ def check_date_conflict(_es, _ee, _is, _ie):
elif _es == _is:
conflict = True
else: # _es > _is
- if _es <= _ie:
+ if _es < _ie:
conflict = True
else:
conflict = False
diff --git a/tests/unit/test-011-itip.py b/tests/unit/test-011-itip.py
index e47d314..08d9949 100644
--- a/tests/unit/test-011-itip.py
+++ b/tests/unit/test-011-itip.py
@@ -394,6 +394,7 @@ class TestITip(unittest.TestCase):
bstart = datetime.datetime(2014,7,13, 12,0,0)
bend = astart + datetime.timedelta(hours=1)
self.assertFalse(itip.check_date_conflict(astart, aend, bstart, bend))
+ self.assertFalse(itip.check_date_conflict(bstart, bend, astart, aend))
bstart = datetime.datetime(2014,6,13, 10,0,0)
bend = datetime.datetime(2014,6,14, 12,0,0)
More information about the commits
mailing list