Commit 1a9a436c authored by OzzieIsaacs's avatar OzzieIsaacs

Fixed wrong translation string

Removed unused variables from callback in server.py
Update Testresults
parent 62dd29d2
...@@ -194,7 +194,7 @@ class WebServer(object): ...@@ -194,7 +194,7 @@ class WebServer(object):
os.execv(sys.executable, arguments) os.execv(sys.executable, arguments)
return True return True
def _killServer(self, ignored_signum, ignored_frame): def _killServer(self, __, ___):
self.stop() self.stop()
def stop(self, restart=False): def stop(self, restart=False):
......
...@@ -8,7 +8,7 @@ try: ...@@ -8,7 +8,7 @@ try:
import queue import queue
except ImportError: except ImportError:
import Queue as queue import Queue as queue
from datetime import datetime, timedelta from datetime import datetime
from collections import namedtuple from collections import namedtuple
from cps import logger from cps import logger
......
...@@ -193,7 +193,7 @@ class TaskConvert(CalibreTask): ...@@ -193,7 +193,7 @@ class TaskConvert(CalibreTask):
ele = ele.decode('utf-8') ele = ele.decode('utf-8')
log.debug(ele.strip('\n')) log.debug(ele.strip('\n'))
if not ele.startswith('Traceback') and not ele.startswith(' File'): if not ele.startswith('Traceback') and not ele.startswith(' File'):
error_message = _("Calibre failed with error: %(error)s", ele.strip('\n')) error_message = _("Calibre failed with error: %(error)s", error=ele.strip('\n'))
return check, error_message return check, error_message
@property @property
......
...@@ -175,6 +175,8 @@ class TaskEmail(CalibreTask): ...@@ -175,6 +175,8 @@ class TaskEmail(CalibreTask):
text = e.smtp_error.decode('utf-8').replace("\n", '. ') text = e.smtp_error.decode('utf-8').replace("\n", '. ')
elif hasattr(e, "message"): elif hasattr(e, "message"):
text = e.message text = e.message
elif hasattr(e, "args"):
text = '\n'.join(e.args)
else: else:
log.exception(e) log.exception(e)
text = '' text = ''
......
...@@ -36,12 +36,16 @@ ...@@ -36,12 +36,16 @@
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;"> <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
<p class='text-justify attribute'><strong>Start Time: </strong>2020-08-29 11:15:36</p>
<p class='text-justify attribute'><strong>Start Time: </strong>2020-08-30 15:47:09</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3"> <div class="col-xs-6 col-md-6 col-sm-offset-3">
<p class='text-justify attribute'><strong>Stop Time: </strong>2020-08-29 12:34:46</p>
<p class='text-justify attribute'><strong>Stop Time: </strong>2020-08-30 17:06:27</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -356,7 +360,7 @@ ...@@ -356,7 +360,7 @@
</div> </div>
<div class="text-left pull-left"> <div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last): <pre class="text-left">Traceback (most recent call last):
File "/home/matthias/Entwicklung/calibre-web-test/test/test_cover_edit_books.py", line 89, in test_upload_jpg File "/home/matthias/Entwicklung/calibre-web-test/test/test_cover_edit_books.py", line 91, in test_upload_jpg
self.assertTrue(self.check_element_on_page((By.ID, 'flash_alert'))) self.assertTrue(self.check_element_on_page((By.ID, 'flash_alert')))
AssertionError: False is not true</pre> AssertionError: False is not true</pre>
</div> </div>
...@@ -920,7 +924,7 @@ AssertionError: False is not true</pre> ...@@ -920,7 +924,7 @@ AssertionError: False is not true</pre>
</div> </div>
<div class="text-left pull-left"> <div class="text-left pull-left">
<pre class="text-left">Traceback (most recent call last): <pre class="text-left">Traceback (most recent call last):
File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_books.py", line 734, in test_upload_cover_hdd File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_books.py", line 735, in test_upload_cover_hdd
self.assertTrue(False, "Browser-Cache Problem: Old Cover is displayed instead of New Cover") self.assertTrue(False, "Browser-Cache Problem: Old Cover is displayed instead of New Cover")
AssertionError: False is not true : Browser-Cache Problem: Old Cover is displayed instead of New Cover</pre> AssertionError: False is not true : Browser-Cache Problem: Old Cover is displayed instead of New Cover</pre>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment