promise: Format times in check_surykatka_json

Since standard date format is used in the ssl_certificate checks, do the
same for readability and consistency in bot_status.

slapos/promise/plugin/check_surykatka_json.py

@@ -55,20 +55,21 @@ class RunPromise(GenericPromise):
       return
     timetuple = email.utils.parsedate(bot_status['date'])
     last_bot_datetime = datetime.datetime.fromtimestamp(time.mktime(timetuple))
+    last_bot_datetime_string = email.utils.formatdate(time.mktime(timetuple))
     delta = self.utcnow - last_bot_datetime
     # sanity check
     if delta < datetime.timedelta(minutes=0):
       logError('Last bot datetime %s is in future, UTC now %s',
-               last_bot_datetime, self.utcnow)
+               last_bot_datetime_string, self.utcnow_string)
       return
     if delta > datetime.timedelta(minutes=15):
       logError('Last bot datetime %s is more than 15 minutes old, UTC now %s',
-               last_bot_datetime, self.utcnow)
+               last_bot_datetime_string, self.utcnow_string)
       return
 
     self.appendInfo(
       '%s: Last bot status from %s ok, UTC now is %s' %
-      (key, last_bot_datetime, self.utcnow))
+      (key, last_bot_datetime_string, self.utcnow_string))
 
   def senseSslCertificate(self):
     key = 'ssl_certificate'
@@ -118,7 +119,8 @@ class RunPromise(GenericPromise):
         appendError(
           'Certificate for %s will expire on %s, which is less than %s days, '
           'UTC now is %s',
-          url, entry['not_after'], certificate_expiration_days, self.utcnow_string)
+          url, entry['not_after'], certificate_expiration_days,
+          self.utcnow_string)
         return
       else:
         self.appendInfo(
@@ -182,7 +184,8 @@ class RunPromise(GenericPromise):
       self.utcnow_string = test_utcnow
     else:
       self.utcnow = datetime.datetime.utcnow()
-      self.utcnow_string = email.utils.formatdate(time.mktime(self.utcnow.timetuple()))
+      self.utcnow_string = email.utils.formatdate(time.mktime(
+        self.utcnow.timetuple()))
 
     self.json_file = self.getConfig('json-file', '')
     if not os.path.exists(self.json_file):

slapos/test/promise/plugin/test_check_surykatka_json.py

@@ -114,8 +114,8 @@ class TestCheckSurykatkaJSONBotStatus(CheckSurykatkaJSONMixin):
     self.launcher.run()
     self.assertPassedMessage(
       self.getPromiseResult(self.promise_name),
-      "bot_status: Last bot status from 2222-12-13 09:10:11 ok, "
-      "UTC now is 2222-12-13 09:11:12"
+      "bot_status: Last bot status from Fri, 13 Dec 2222 08:10:11 -0000 "
+      "ok, UTC now is Wed, 13 Dec 2222 09:11:12 -0000"
     )
 
   def test_bot_status_future(self):
@@ -140,8 +140,8 @@ class TestCheckSurykatkaJSONBotStatus(CheckSurykatkaJSONMixin):
       self.launcher.run()
     self.assertFailedMessage(
       self.getPromiseResult(self.promise_name),
-      "bot_status: Last bot datetime 2223-12-13 09:10:11 is in "
-      "future, UTC now 2222-12-13 09:11:12"
+      "bot_status: Last bot datetime Sat, 13 Dec 2223 08:10:11 -0000 is "
+      "in future, UTC now Wed, 13 Dec 2222 09:11:12 -0000"
     )
 
   def test_bot_status_old(self):
@@ -166,8 +166,8 @@ class TestCheckSurykatkaJSONBotStatus(CheckSurykatkaJSONMixin):
       self.launcher.run()
     self.assertFailedMessage(
       self.getPromiseResult(self.promise_name),
-      "bot_status: Last bot datetime 2223-12-13 09:10:11 is "
-      "more than 15 minutes old, UTC now 2223-12-13 09:26:12"
+      "bot_status: Last bot datetime Sat, 13 Dec 2223 08:10:11 -0000 is "
+      "more than 15 minutes old, UTC now Wed, 13 Dec 2223 09:26:12 -0000"
     )
 
   def test_not_bot_status(self):