aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qc_app/entry.py6
-rw-r--r--tests/test_data/average.tsv.zipbin0 -> 35479706 bytes
-rw-r--r--tests/test_data/empty.zipbin0 -> 22 bytes
-rw-r--r--tests/test_data/multiple_files.zipbin0 -> 35495094 bytes
-rw-r--r--tests/test_data/non_tsv.zipbin0 -> 224 bytes
5 files changed, 3 insertions, 3 deletions
diff --git a/qc_app/entry.py b/qc_app/entry.py
index c53648a..efcaf4e 100644
--- a/qc_app/entry.py
+++ b/qc_app/entry.py
@@ -55,7 +55,7 @@ def zip_file_errors(filepath, upload_dir) -> Tuple[str, ...]:
if len(infolist) != 1:
zfile_errors = zfile_errors + (
("Expected exactly one (1) member file within the uploaded zip "
- "file. Got {len(infolist)} member files."),)
+ f"file. Got {len(infolist)} member files."),)
if len(infolist) == 1 and infolist[0].is_dir():
zfile_errors = zfile_errors + (
("Expected a member text file in the uploaded zip file. Got a "
@@ -82,7 +82,7 @@ def upload_file():
if request_errors:
for error in request_errors:
flash(error, "alert-error")
- return render_template("index.html")
+ return render_template("index.html"), 400
filename = secure_filename(request.files["qc_text_file"].filename)
if not os.path.exists(upload_dir):
@@ -95,7 +95,7 @@ def upload_file():
if zip_errors:
for error in zip_errors:
flash(error, "alert-error")
- return render_template("index.html")
+ return render_template("index.html"), 400
return redirect(url_for(
"parse.parse", filename=filename,
diff --git a/tests/test_data/average.tsv.zip b/tests/test_data/average.tsv.zip
new file mode 100644
index 0000000..09dda4e
--- /dev/null
+++ b/tests/test_data/average.tsv.zip
Binary files differ
diff --git a/tests/test_data/empty.zip b/tests/test_data/empty.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/tests/test_data/empty.zip
Binary files differ
diff --git a/tests/test_data/multiple_files.zip b/tests/test_data/multiple_files.zip
new file mode 100644
index 0000000..5c2d028
--- /dev/null
+++ b/tests/test_data/multiple_files.zip
Binary files differ
diff --git a/tests/test_data/non_tsv.zip b/tests/test_data/non_tsv.zip
new file mode 100644
index 0000000..b3787a6
--- /dev/null
+++ b/tests/test_data/non_tsv.zip
Binary files differ