Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glue] fix return dates error on sdk . (#5912)

Browse Source
This commit is contained in:
shmuelqwak 2023-02-09 15:42:16 +02:00 committed by GitHub
parent f78ced59b3
commit c6c0e50ee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/glue/models.py
View File

@ -7,6 +7,7 @@ from typing import Dict, List
from moto.core import BaseBackend, BackendDict, BaseModel from moto.core import BaseBackend, BackendDict, BaseModel
from moto.moto_api import state_manager from moto.moto_api import state_manager
from moto.moto_api._internal import mock_random from moto.moto_api._internal import mock_random
from moto.core.utils import unix_time
from moto.moto_api._internal.managed_state_model import ManagedState from moto.moto_api._internal.managed_state_model import ManagedState
from .exceptions import ( from .exceptions import (
JsonRESTError, JsonRESTError,
@ -759,7 +760,7 @@ class FakeDatabase(BaseModel):
"Description": self.input.get("Description"), "Description": self.input.get("Description"),
"LocationUri": self.input.get("LocationUri"), "LocationUri": self.input.get("LocationUri"),
"Parameters": self.input.get("Parameters"), "Parameters": self.input.get("Parameters"),
"CreateTime": self.created_time.isoformat(), "CreateTime": unix_time(self.created_time),
"CreateTableDefaultPermissions": self.input.get( "CreateTableDefaultPermissions": self.input.get(
"CreateTableDefaultPermissions" "CreateTableDefaultPermissions"
), ),
@ -797,7 +798,7 @@ class FakeTable(BaseModel):
obj = { obj = {
"DatabaseName": self.database_name, "DatabaseName": self.database_name,
"Name": self.name, "Name": self.name,
"CreateTime": self.created_time.isoformat(), "CreateTime": unix_time(self.created_time),
} }
obj.update(self.get_version(version)) obj.update(self.get_version(version))
return obj return obj

24
tests/test_glue/test_datacatalog.py
View File

@ -14,7 +14,7 @@ from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID
from . import helpers from . import helpers
FROZEN_CREATE_TIME = datetime(2015, 1, 1, 0, 0, 0) FROZEN_CREATE_TIME = datetime(2015, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
@mock_glue @mock_glue
@ -34,7 +34,9 @@ def test_create_database():
database.get("LocationUri").should.equal(database_input.get("LocationUri")) database.get("LocationUri").should.equal(database_input.get("LocationUri"))
database.get("Parameters").should.equal(database_input.get("Parameters")) database.get("Parameters").should.equal(database_input.get("Parameters"))
if not settings.TEST_SERVER_MODE: if not settings.TEST_SERVER_MODE:
database.get("CreateTime").should.equal(FROZEN_CREATE_TIME) database.get("CreateTime").timestamp().should.equal(
FROZEN_CREATE_TIME.timestamp()
)
database.get("CreateTableDefaultPermissions").should.equal( database.get("CreateTableDefaultPermissions").should.equal(
database_input.get("CreateTableDefaultPermissions") database_input.get("CreateTableDefaultPermissions")
) )
@ -175,7 +177,7 @@ def test_create_table():
table = response["Table"] table = response["Table"]
if not settings.TEST_SERVER_MODE: if not settings.TEST_SERVER_MODE:
table["CreateTime"].should.equal(FROZEN_CREATE_TIME) table["CreateTime"].timestamp().should.equal(FROZEN_CREATE_TIME.timestamp())
table["Name"].should.equal(table_input["Name"]) table["Name"].should.equal(table_input["Name"])
table["StorageDescriptor"].should.equal(table_input["StorageDescriptor"]) table["StorageDescriptor"].should.equal(table_input["StorageDescriptor"])
@ -1136,8 +1138,12 @@ def test_create_crawler_scheduled():
crawler.get("CrawlElapsedTime").should.equal(0) crawler.get("CrawlElapsedTime").should.equal(0)
crawler.get("Version").should.equal(1) crawler.get("Version").should.equal(1)
if not settings.TEST_SERVER_MODE: if not settings.TEST_SERVER_MODE:
crawler.get("CreationTime").should.equal(FROZEN_CREATE_TIME) crawler.get("CreationTime").timestamp().should.equal(
crawler.get("LastUpdated").should.equal(FROZEN_CREATE_TIME) FROZEN_CREATE_TIME.timestamp()
)
crawler.get("LastUpdated").timestamp().should.equal(
FROZEN_CREATE_TIME.timestamp()
)
crawler.should.not_have.key("LastCrawl") crawler.should.not_have.key("LastCrawl")
@ -1216,8 +1222,12 @@ def test_create_crawler_unscheduled():
crawler.get("CrawlElapsedTime").should.equal(0) crawler.get("CrawlElapsedTime").should.equal(0)
crawler.get("Version").should.equal(1) crawler.get("Version").should.equal(1)
if not settings.TEST_SERVER_MODE: if not settings.TEST_SERVER_MODE:
crawler.get("CreationTime").should.equal(FROZEN_CREATE_TIME) crawler.get("CreationTime").timestamp().should.equal(
crawler.get("LastUpdated").should.equal(FROZEN_CREATE_TIME) FROZEN_CREATE_TIME.timestamp()
)
crawler.get("LastUpdated").timestamp().should.equal(
FROZEN_CREATE_TIME.timestamp()
)
crawler.should.not_have.key("LastCrawl") crawler.should.not_have.key("LastCrawl")