Merge pull request hyperledger#1135 from ArtObr/indy_1953

INDY-1953: Fix for upgrade and test

indy_node/server/upgrader.py

@@ -448,7 +448,7 @@ def isScheduleValid(self, schedule, node_srvs, force) -> (bool, str):
             return True, ''
         times = sorted(times)
         for i in range(len(times) - 1):
-            diff = (times[i + 1] - times[i]).seconds
+            diff = (times[i + 1] - times[i]).total_seconds()
             if diff < self.config.MinSepBetweenNodeUpgrades:
                 return False, 'time span between upgrades is {} ' \
                               'seconds which is less than specified ' \

indy_node/test/upgrade/test_pool_upgrade_same_time_different_days.py

@@ -0,0 +1,24 @@
+from copy import deepcopy
+
+from datetime import datetime, timedelta
+
+import dateutil
+import dateutil.tz
+
+from indy_node.test.upgrade.helper import sdk_ensure_upgrade_sent
+
+
+def test_pool_upgrade_same_time_different_days(looper, tconf, nodeSet,
+                                               validUpgrade, sdk_pool_handle,
+                                               sdk_wallet_trustee, nodeIds):
+    day_in_sec = 24 * 60 * 60
+    upgr1 = deepcopy(validUpgrade)
+    schedule = {}
+    unow = datetime.utcnow().replace(tzinfo=dateutil.tz.tzutc())
+    startAt = unow + timedelta(seconds=day_in_sec)
+    for i in nodeIds:
+        schedule[i] = datetime.isoformat(startAt)
+        startAt = startAt + timedelta(seconds=day_in_sec)
+    upgr1['schedule'] = schedule
+
+    sdk_ensure_upgrade_sent(looper, sdk_pool_handle, sdk_wallet_trustee, upgr1)