From 13b4306f40a67d2a69e6cfc3e1fc8e35036a8954 Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Thu, 14 Jul 2016 16:53:02 +0200 Subject: [PATCH] Remove one more occurrence of the time bomb --- tests/test_api.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/test_api.py b/tests/test_api.py index 022b68e8..51bdf9b3 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -1,9 +1,9 @@ - +import datetime import json import psycopg2 +import pytz import unittest -import dateutil.parser from mock import Mock, patch from patroni.api import RestApiHandler, RestApiServer from patroni.dcs import ClusterConfig, Member @@ -12,6 +12,10 @@ from six.moves import BaseHTTPServer from test_postgresql import psycopg2_connect, MockCursor +future_restart_time = datetime.datetime.now(pytz.utc) + datetime.timedelta(days=5) +postmaster_start_time = datetime.datetime.now(pytz.utc) + + class MockPostgresql(object): name = 'test' @@ -28,7 +32,7 @@ class MockPostgresql(object): @staticmethod def postmaster_start_time(): - return '2016-08-20 12:00TZ+1' + return str(postmaster_start_time) class MockHa(object): @@ -71,7 +75,7 @@ class MockPatroni(object): tags = {} version = '0.00' noloadbalance = Mock(return_value=False) - scheduled_restart = {'schedule': dateutil.parser.parse('2016-08-29 12:45TZ+1'), + scheduled_restart = {'schedule': future_restart_time, 'postmaster_start_time': postgresql.postmaster_start_time()} @staticmethod