Merge pull request #69 from mandarons/retry_login_interval

added retry_login_interval delay when retrying missing password
mandarons · Feb 15, 2022 · 3302893 · 3302893
2 parents 785974f + e520809
commit 3302893
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/sync.py b/src/sync.py
@@ -52,6 +52,15 @@ def sync():
                 LOGGER.error(
                     "Password is not stored in keyring. Please save the password in keyring."
                 )
+                sleep_for = config_parser.get_retry_login_interval(config=config)
+                next_sync = (
+                    datetime.datetime.now() + datetime.timedelta(seconds=sleep_for)
+                ).strftime("%c")
+                LOGGER.info("Retrying login at %s ...", next_sync)
+                last_send = notify.send(config, last_send)
+                sleep(sleep_for)
+                continue
+
         if "drive" not in config and "photos" in config:
             sleep_for = photos_sync_interval
             enable_sync_drive = False

diff --git a/tests/test_sync.py b/tests/test_sync.py
@@ -150,21 +150,32 @@ def test_sync_2fa_required(
         self.assertTrue(len(captured.records) > 1)
         self.assertTrue(len([e for e in captured[1] if "2FA is required" in e]) > 0)
 
+    @patch("src.sync.sleep")
     @patch(target="keyring.get_password", return_value=data.VALID_PASSWORD)
     @patch(
         target="src.config_parser.get_username", return_value=data.AUTHENTICATED_USER
     )
     @patch("icloudpy.ICloudPyService")
     @patch("src.sync.read_config")
     def test_sync_password_missing_in_keyring(
-        self, mock_read_config, mock_service, mock_get_username, mock_get_password
+        self,
+        mock_read_config,
+        mock_service,
+        mock_get_username,
+        mock_get_password,
+        mock_sleep,
     ):
         mock_service = self.service
         config = self.config.copy()
         mock_read_config.return_value = config
         with self.assertLogs() as captured:
             mock_get_password.return_value = None
-            self.assertIsNone(sync.sync())
+            mock_sleep.side_effect = [
+                None,
+                Exception(),
+            ]
+            with self.assertRaises(Exception):
+                sync.sync()
             self.assertTrue(
                 len(
                     [