From d9d4ebf3a24db79e6d193a27187c2cde067c89e2 Mon Sep 17 00:00:00 2001
From: jfriedli
Date: Tue, 24 Sep 2019 10:59:00 -0700
Subject: Resolve "Delete Files After Adding To Zip"

---
 .gitlab-ci.yml   |  4 ++--
 main.py          |  1 +
 test/test_api.py | 13 +++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 481d32a..b7e2440 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
 image: debian:testing
 
 stages:
-  - build
   - linting
   - test
+  - build_container
 
 variables:
   CONTAINER_TEST_IMAGE: registry.0xacab.org/jvoisin/mat2-web:$CI_BUILD_REF_NAME
@@ -35,7 +35,7 @@ tests:debian:
   - python3-coverage report -m
 
 build-docker:
-  stage: build
+  stage: build_container
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
diff --git a/main.py b/main.py
index d8649d7..5c6211d 100644
--- a/main.py
+++ b/main.py
@@ -215,6 +215,7 @@ def create_app(test_config=None):
                     )
                     try:
                         cleaned_files_zip.write(complete_path)
+                        os.remove(complete_path)
                     except ValueError:
                         abort(400, message='Creating the archive failed')
 
diff --git a/test/test_api.py b/test/test_api.py
index 4b67478..532ceb9 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -3,6 +3,9 @@ import tempfile
 import json
 import os
 import shutil
+import zipfile
+
+from six import BytesIO
 
 import main
 
@@ -208,11 +211,21 @@ class Mat2APITestCase(unittest.TestCase):
         self.assertEqual(response['meta_after'], {})
 
         request = self.app.get(response['download_link'])
+        zip_response = zipfile.ZipFile(BytesIO(request.data))
+        self.assertEquals(2, len(zip_response.namelist()))
+        for name in zip_response.namelist():
+            self.assertIn('.cleaned.jpg', name)
         self.assertEqual(request.status_code, 200)
 
         request = self.app.get(response['download_link'])
         self.assertEqual(request.status_code, 404)
 
+        request = self.app.get(upload_one['download_link'])
+        self.assertEqual(request.status_code, 404)
+
+        request = self.app.get(upload_two['download_link'])
+        self.assertEqual(request.status_code, 404)
+
     def test_api_bulk_download_validation(self):
         post_body = {
             u'download_list': [
-- 
cgit v1.3