Converting your parameters to JSON...
diff --git a/tests/integration/test_e2e.py b/tests/integration/test_e2e.py
index 8d8037ca..655d1d4b 100644
--- a/tests/integration/test_e2e.py
+++ b/tests/integration/test_e2e.py
@@ -47,14 +47,20 @@ def setup_workspace(workspace):
report_to_run.write_lines(DUMMY_REPORT.split("\n"))
-def _check_report_output(job_id, serialiser, **kwargs):
+def _get_report_output(job_id, serialiser):
while True:
result = serialiser.get_check_result(job_id)
if result.status not in (JobStatus.PENDING, JobStatus.SUBMITTED):
break
+ return result
+
+
+def _check_report_output(job_id, serialiser, **kwargs):
+ result = _get_report_output(job_id, serialiser)
assert result.status == JobStatus.DONE, result.error_info
assert result.stdout != ""
assert result.raw_html
+ assert result.email_html
assert result.raw_ipynb_json
assert result.pdf == ""
assert result.job_start_time < result.job_finish_time
@@ -74,6 +80,11 @@ def test_run_report(bson_library, flask_app, setup_and_cleanup_notebooker_filesy
_check_report_output(
job_id, serialiser, overrides=overrides, report_name=report_name, report_title=report_title, mailto=mailto
)
+
+ result = _get_report_output(job_id, serialiser)
+ assert 'DataFrame' in result.email_html
+ assert 'DataFrame' in result.raw_html
+
assert job_id == serialiser.get_latest_job_id_for_name_and_params(report_name, overrides)
assert job_id == serialiser.get_latest_job_id_for_name_and_params(report_name, None)
assert job_id == serialiser.get_latest_successful_job_id_for_name_and_params(report_name, overrides)
@@ -113,3 +124,28 @@ def test_run_report_and_rerun(bson_library, flask_app, setup_and_cleanup_noteboo
assert not {job_id, new_job_id} - set(serialiser.get_all_job_ids_for_name_and_params(report_name, overrides))
assert new_job_id == serialiser.get_latest_successful_job_id_for_name_and_params(report_name, overrides)
assert job_id != serialiser.get_latest_successful_job_id_for_name_and_params(report_name, overrides)
+
+
+@freezegun.freeze_time(datetime.datetime(2018, 1, 12))
+def test_run_report(bson_library, flask_app, setup_and_cleanup_notebooker_filesystem, setup_workspace):
+ with flask_app.app_context():
+ serialiser = get_serializer()
+ overrides = {"n_points": 5}
+ report_name = "fake/report"
+ report_title = "my report title"
+ mailto = "jon@fakeemail.com"
+ job_id = run_report(
+ report_name, report_title, mailto, overrides, hide_code=True, generate_pdf_output=False, prepare_only=True
+ )
+ _check_report_output(
+ job_id, serialiser, overrides=overrides, report_name=report_name, report_title=report_title, mailto=mailto
+ )
+
+ result = _get_report_output(job_id, serialiser)
+ assert 'DataFrame' not in result.email_html
+ assert 'DataFrame' in result.raw_html
+
+ assert job_id == serialiser.get_latest_job_id_for_name_and_params(report_name, overrides)
+ assert job_id == serialiser.get_latest_job_id_for_name_and_params(report_name, None)
+ assert job_id == serialiser.get_latest_successful_job_id_for_name_and_params(report_name, overrides)
+ assert job_id == serialiser.get_latest_successful_job_id_for_name_and_params(report_name, None)
diff --git a/tests/integration/test_execute_notebook.py b/tests/integration/test_execute_notebook.py
index a588db4f..21e0e230 100644
--- a/tests/integration/test_execute_notebook.py
+++ b/tests/integration/test_execute_notebook.py
@@ -1,6 +1,7 @@
from __future__ import unicode_literals
import mock
+import pytest
from click.testing import CliRunner
from nbformat import NotebookNode
from nbformat import __version__ as nbv
@@ -54,3 +55,46 @@ def test_main(mongo_host):
)
assert result.raw_ipynb_json
assert result.pdf == pdf_contents
+
+@pytest.mark.parametrize(
+ ('cli_args', 'expected_mailto'),
+ [
+ (
+ ['--report-name', 'crashyreport', '--mailto', 'happy@email'],
+ 'happy@email',
+ ), (
+ ['--report-name', 'crashyreport', '--mailto', 'happy@email', '--error-mailto', 'sad@email'],
+ 'sad@email',
+ ), (
+ ['--report-name', 'crashyreport', '--error-mailto', 'sad@email'],
+ 'sad@email',
+ )
+ ]
+)
+def test_main(mongo_host, cli_args, expected_mailto):
+ with mock.patch("notebooker.execute_notebook.pm.execute_notebook") as exec_nb, mock.patch(
+ "notebooker.utils.conversion.jupytext.read"
+ ) as read_nb, mock.patch("notebooker.execute_notebook.send_result_email") as send_email:
+ exec_nb.side_effect = Exception()
+ versions = nbv.split(".")
+ major, minor = int(versions[0]), int(versions[1])
+ if major >= 5:
+ major, minor = 4, 4
+ read_nb.return_value = NotebookNode({"cells": [], "metadata": {}, "nbformat": major, "nbformat_minor": minor})
+ job_id = "ttttteeeesssstttt"
+ runner = CliRunner()
+ cli_result = runner.invoke(
+ base_notebooker,
+ [
+ "--serializer-cls",
+ DEFAULT_SERIALIZER,
+ "--mongo-host",
+ mongo_host,
+ "execute-notebook",
+ "--job-id",
+ job_id,
+ ] + cli_args,
+ )
+
+ mailto = send_email.call_args_list[0][0][0].mailto
+ assert mailto == expected_mailto
diff --git a/tests/integration/test_report_hunter.py b/tests/integration/test_report_hunter.py
index 1489f955..9ce3e065 100644
--- a/tests/integration/test_report_hunter.py
+++ b/tests/integration/test_report_hunter.py
@@ -164,6 +164,7 @@ def test_report_hunter_pending_to_done(bson_library, webapp_config):
pdf="",
raw_ipynb_json="[]",
raw_html="",
+ email_html="",
)
_report_hunter(webapp_config=webapp_config, run_once=True)
@@ -176,6 +177,7 @@ def test_report_hunter_pending_to_done(bson_library, webapp_config):
job_start_time=datetime.datetime(2018, 1, 12, 2, 30),
job_finish_time=datetime.datetime(2018, 1, 12, 2, 37),
raw_html="",
+ email_html="",
raw_html_resources={"outputs": {}},
raw_ipynb_json="[]",
)
diff --git a/tests/unit/utils/test_utils_notebook_execution.py b/tests/unit/utils/test_utils_notebook_execution.py
index eaa6b447..59f4468b 100644
--- a/tests/unit/utils/test_utils_notebook_execution.py
+++ b/tests/unit/utils/test_utils_notebook_execution.py
@@ -30,6 +30,7 @@
],
)
def test_send_result_email(test_name, job_id, report_name, report_title, expected_title):
+ to_email = "∫åññîsté®@test-email.com"
body_in = "
hello 😆 😉 😊 😋 😎
"
result = NotebookResultComplete(
job_id=job_id,
@@ -38,13 +39,14 @@ def test_send_result_email(test_name, job_id, report_name, report_title, expecte
raw_html_resources={},
raw_ipynb_json={},
raw_html=body_in,
+ email_html=body_in,
+ mailto=to_email,
pdf="",
report_name=report_name,
report_title=report_title,
)
- to_email = "∫åññîsté®@test-email.com"
with mock.patch("notebooker.utils.notebook_execution.mail") as mail:
- notebook_execution.send_result_email(result, to_email)
+ notebook_execution.send_result_email(result)
email_sent = mail.mock_calls[0][1]
assert len(email_sent) == 4, "mail() was not called with the correct number of args"
from_address = email_sent[0]
@@ -56,3 +58,72 @@ def test_send_result_email(test_name, job_id, report_name, report_title, expecte
assert to_address == to_email
assert title == expected_title
assert body == ["Please either activate HTML emails, or see the PDF attachment.", body_in]
+
+
+def test_send_result_email_fallback_to_raw_html():
+ body_in = "
hello 😆 😉 😊 😋 😎
"
+ to_email = "hello@you"
+ result = NotebookResultComplete(
+ job_id="fallback",
+ job_start_time=datetime.datetime.now(),
+ job_finish_time=datetime.datetime.now(),
+ mailto=to_email,
+ raw_html_resources={},
+ raw_ipynb_json={},
+ raw_html=body_in,
+ pdf="",
+ report_name="fallback",
+ report_title="fallback",
+ )
+ with mock.patch("notebooker.utils.notebook_execution.mail") as mail:
+ notebook_execution.send_result_email(result)
+ email_sent = mail.mock_calls[0][1]
+ assert len(email_sent) == 4, "mail() was not called with the correct number of args"
+ from_address = email_sent[0]
+ to_address = email_sent[1]
+ title = email_sent[2]
+ body = email_sent[3]
+
+ assert from_address == "notebooker@notebooker.io"
+ assert to_address == to_email
+ assert title == "Notebooker: fallback report completed with status: Checks done!"
+ assert body == ["Please either activate HTML emails, or see the PDF attachment.", body_in]
+
+
+@pytest.mark.parametrize(
+ ("subject", "expected"),
+ [
+ ("", "Notebooker: subjecttest report completed with status: Checks done!"),
+ (None, "Notebooker: subjecttest report completed with status: Checks done!"),
+ ("my super cool report title", "my super cool report title"),
+ ]
+)
+def test_send_result_email_subject(subject, expected):
+ body_in = "
hello 😆 😉 😊 😋 😎
"
+ to_email = "∫åññîsté®@ahl.com"
+ result = NotebookResultComplete(
+ job_id="subjecttest",
+ job_start_time=datetime.datetime.now(),
+ job_finish_time=datetime.datetime.now(),
+ raw_html_resources={},
+ raw_ipynb_json={},
+ raw_html=body_in,
+ mailto=to_email,
+ email_subject=subject,
+ pdf="",
+ report_name="subjecttest",
+ report_title="subjecttest",
+ )
+ with mock.patch("notebooker.utils.notebook_execution.mail") as mail:
+ notebook_execution.send_result_email(result)
+ email_sent = mail.mock_calls[0][1]
+ assert len(email_sent) == 4, "mail() was not called with the correct number of args"
+ from_address = email_sent[0]
+ to_address = email_sent[1]
+ title = email_sent[2]
+ body = email_sent[3]
+
+ assert from_address == "notebooker@notebooker.io"
+ assert to_address == to_email
+ assert title == expected
+ assert body == ["Please either activate HTML emails, or see the PDF attachment.", body_in]