summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjwansek <eddie.atten.ea29@gmail.com>2022-01-31 15:40:56 +0000
committerjwansek <eddie.atten.ea29@gmail.com>2022-01-31 15:40:56 +0000
commitff07842dc629e07f081ae578e50c42e4a54bc810 (patch)
treedfbc9f8d57bc850ea6af906163f6ad4c27878a54
parent1f47944208cb9ddabce1b99a410a4c87db4a2b6a (diff)
downloadSmarker-ff07842dc629e07f081ae578e50c42e4a54bc810.tar.gz
Smarker-ff07842dc629e07f081ae578e50c42e4a54bc810.zip
Added datetime and removed newlines from pytest reports for txt template
-rw-r--r--examplerun.bat2
-rw-r--r--templates/txt.jinja23
2 files changed, 3 insertions, 2 deletions
diff --git a/examplerun.bat b/examplerun.bat
index 01e133c..3364a63 100644
--- a/examplerun.bat
+++ b/examplerun.bat
@@ -1,3 +1,3 @@
zip -r 100301654.zip .\ExampleSubmission\
-python .\mark.py -s 100301654.zip -a .\ExampleAssessments\example.yml -f md
+python .\mark.py -s 100301654.zip -a .\ExampleAssessments\example.yml -f md -o auto
rm 100301654.zip \ No newline at end of file
diff --git a/templates/txt.jinja2 b/templates/txt.jinja2
index df2e100..5ab8776 100644
--- a/templates/txt.jinja2
+++ b/templates/txt.jinja2
@@ -38,6 +38,7 @@
{%- endmacro -%}
=== {{ name }} - Student ID: {{ student_no }} Automatic marking report ===
+Report generated at {{ get_datetime() }}
== Class Tree: ==
@@ -109,5 +110,5 @@
{% endfor %}
{% if out != "stdout" -%}
-{{ test_results["pytest_report"] }}
+{{ test_results["pytest_report"].replace("\n", "") }}
{%- endif -%} \ No newline at end of file