From 81dbf0ee273ddb5775d8a8b7f2ded820c37cae67 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Wed, 28 Nov 2018 22:53:13 +0100
Subject: [PATCH] TST fix caching problem and adjusted some delays
---
.gitlab-ci.yml | 2 +-
misc/unit_test_http_server.py | 12 ++++++++++++
test/js/modules/webcaosdb.js.js | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 045285ef..51460005 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ test:qunit:
tags: [ py34 ]
artifacts:
paths:
- - qunit.log
+ - public/qunit.log
- screenlog.*
script:
- make run-qunit
diff --git a/misc/unit_test_http_server.py b/misc/unit_test_http_server.py
index e9c7972f..06675723 100755
--- a/misc/unit_test_http_server.py
+++ b/misc/unit_test_http_server.py
@@ -53,6 +53,18 @@ class UnitTestsHandler(SimpleHTTPRequestHandler):
#return HTTP status: 404 Not Found
self.send_response(404)
+ def send_response(self, code, message=None):
+ """send_response
+
+ Set Cache-Control, Pragma and Expires headers. Then call send_response
+ of BaseHTTPRequestHandler.
+ """
+ super().send_response(code=code, message=message)
+ if self.command == "GET":
+ self.send_header("Cache-Control", "no-cache, no-store, must-revalidate")
+ self.send_header("Pragma", "no-cache")
+ self.send_header("Expires", "0")
+
def done(self):
"""done
diff --git a/test/js/modules/webcaosdb.js.js b/test/js/modules/webcaosdb.js.js
index a2d5635d..dd1ffdc6 100644
--- a/test/js/modules/webcaosdb.js.js
+++ b/test/js/modules/webcaosdb.js.js
@@ -1032,7 +1032,7 @@ QUnit.test("createCarouselNav", function(assert) {
assert.equal($(ref_property_elem).find('.' + preview.classNamePreview).length, 0, 'no carousel after reset');
done();
- }, 400);
+ }, 600);
}, 400);
--
GitLab