Skip to content

Commit

Permalink
Merge pull request #50 from Fanevanjanahary/conf
Browse files Browse the repository at this point in the history
Fix created_date in conf
  • Loading branch information
Samweli committed Dec 9, 2021
2 parents 3627bdf + e2b7570 commit 6c2e5a1
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 10 deletions.
10 changes: 6 additions & 4 deletions src/qgis_stac/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,17 @@ def from_qgs_settings(
:returns: Connection settings object
:rtype: ConnectionSettings
"""
created_date = datetime.datetime.strptime(
settings.value("created_date"),
"%Y-%m-%dT%H:%M:%S.%fZ"
)
try:
created_date = datetime.datetime.strptime(
settings.value("created_date"),
"%Y-%m-%dT%H:%M:%S.%fZ"
)
auth_cfg = settings.value("auth_config").strip()

except AttributeError:
created_date = datetime.datetime.now()
auth_cfg = None

return cls(
id=uuid.UUID(identifier),
name=settings.value("name"),
Expand Down
28 changes: 22 additions & 6 deletions test/test_settings_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,13 @@ def test_connection_settings(self):
connection_id
)
self.assertEqual(
connection,
stored_connection
connection.auth_config,
stored_connection.auth_config
)

self.assertEqual(
connection.created_date.replace(second=0, microsecond=0),
stored_connection.created_date.replace(second=0, microsecond=0)
)

# Adding a second connection, setting it a current selected
Expand All @@ -102,8 +107,13 @@ def test_connection_settings(self):
second_connection_id
)
self.assertEqual(
second_connection,
second_stored_connection
second_connection.auth_config,
second_stored_connection.auth_config
)

self.assertEqual(
second_connection.created_date.replace(second=0, microsecond=0),
second_stored_connection.created_date.replace(second=0, microsecond=0)
)
settings_manager.set_current_connection(
second_connection_id
Expand All @@ -113,9 +123,15 @@ def test_connection_settings(self):
self.assertTrue(settings_manager.is_current_connection(
second_connection_id
))

self.assertEqual(
second_connection.auth_config,
current_connection.auth_config
)

self.assertEqual(
second_connection,
current_connection
second_connection.created_date.replace(second=0, microsecond=0),
current_connection.created_date.replace(second=0, microsecond=0)
)

# Retrieve all the connections
Expand Down

0 comments on commit 6c2e5a1

Please sign in to comment.