From 8cca33dc42f0217a00068d6727757953db8e1a3a Mon Sep 17 00:00:00 2001 From: Iiro Sulopuisto Date: Tue, 30 Jul 2019 14:14:14 +0300 Subject: [PATCH 1/2] Test redshift cluster creation time more thoroughly --- tests/test_redshift/test_redshift.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_redshift/test_redshift.py b/tests/test_redshift/test_redshift.py index 541614788..2c9b42a1d 100644 --- a/tests/test_redshift/test_redshift.py +++ b/tests/test_redshift/test_redshift.py @@ -36,6 +36,7 @@ def test_create_cluster_boto3(): response['Cluster']['NodeType'].should.equal('ds2.xlarge') create_time = response['Cluster']['ClusterCreateTime'] create_time.should.be.lower_than(datetime.datetime.now(create_time.tzinfo)) + create_time.should.be.greater_than(datetime.datetime.now(create_time.tzinfo) - datetime.timedelta(minutes=1)) @mock_redshift From 24bd99b5c4d161b1af22b86d48bc4cc141e7e44a Mon Sep 17 00:00:00 2001 From: Iiro Sulopuisto Date: Tue, 30 Jul 2019 14:16:12 +0300 Subject: [PATCH 2/2] Make cluster creation time UTC --- moto/redshift/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moto/redshift/models.py b/moto/redshift/models.py index 64e5c5e35..c0b783bde 100644 --- a/moto/redshift/models.py +++ b/moto/redshift/models.py @@ -78,7 +78,7 @@ class Cluster(TaggableResourceMixin, BaseModel): super(Cluster, self).__init__(region_name, tags) self.redshift_backend = redshift_backend self.cluster_identifier = cluster_identifier - self.create_time = iso_8601_datetime_with_milliseconds(datetime.datetime.now()) + self.create_time = iso_8601_datetime_with_milliseconds(datetime.datetime.utcnow()) self.status = 'available' self.node_type = node_type self.master_username = master_username