Use CACHE_TIMEOUT for all static files

oittaa · Jan 31, 2021 · d3fd42c · d3fd42c
1 parent f5e18c2
commit d3fd42c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/main.py b/app/main.py
@@ -45,6 +45,7 @@
     ]
 }
 app = Flask(__name__)
+app.config['SEND_FILE_MAX_AGE_DEFAULT'] = CACHE_TIMEOUT
 app.wsgi_app = ProxyFix(app.wsgi_app, x_for=X_FOR, x_proto=X_PROTO)
 talisman = Talisman(
     app,

diff --git a/app/test.py b/app/test.py
@@ -125,6 +125,10 @@ def test_api_get(self, mock_dl, mock_ul, mock_be):
         r = requests.get(TEST_NET_AVIF)
         self.assertEqual(response.data, r.content)
         mock_dl.side_effect = self.download_blob
+        self.cache['-testing-'+TEST_NET_JPG_HASH+'.avif'] = 'FAKEDATA'.encode('utf-8')
+        response = self.app.get('/api?url={}'.format(urllib.parse.quote(TEST_NET_JPG)), follow_redirects=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data, 'FAKEDATA'.encode('utf-8'))
         mock_ul.side_effect = self.upload_blob
         response = self.app.get('/api?url={}'.format(urllib.parse.quote(TEST_NET_BMP)), follow_redirects=True)
         self.assertEqual(response.status_code, 200)
@@ -134,10 +138,6 @@ def test_api_get(self, mock_dl, mock_ul, mock_be):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.headers.get('Content-Type'), 'image/avif')
         self.assertEqual(response.data, temp_data)
-        self.cache['-testing-'+TEST_NET_JPG_HASH+'.avif'] = 'FAKEDATA'.encode('utf-8')
-        response = self.app.get('/api?url={}'.format(urllib.parse.quote(TEST_NET_JPG)), follow_redirects=True)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data, 'FAKEDATA'.encode('utf-8'))
 
     @patch('main.blob_exists')
     @patch('main.upload_blob', side_effect=exceptions.NotFound('Test'))