diff options
| author | Andrey Zelenkov <zelenkov@nginx.com> | 2019-07-02 16:44:08 +0300 |
|---|---|---|
| committer | Andrey Zelenkov <zelenkov@nginx.com> | 2019-07-02 16:44:08 +0300 |
| commit | bcb9048c4663a34d9b29a6b5b8e3da14a4321a96 (patch) | |
| tree | 44b98f43740e2929aa5be2d54cfb1bd73ff7fee1 /test | |
| parent | 29225c4fc62e2cf8b06ad8507fe64c079c69974a (diff) | |
| download | unit-bcb9048c4663a34d9b29a6b5b8e3da14a4321a96.tar.gz unit-bcb9048c4663a34d9b29a6b5b8e3da14a4321a96.tar.bz2 | |
Tests: adjusted inactive interval in Java app for slow hosts.
Diffstat (limited to 'test')
| -rw-r--r-- | test/java/session_inactive/app.java | 8 | ||||
| -rw-r--r-- | test/test_java_application.py | 16 |
2 files changed, 19 insertions, 5 deletions
diff --git a/test/java/session_inactive/app.java b/test/java/session_inactive/app.java index f338fc89..618e4d67 100644 --- a/test/java/session_inactive/app.java +++ b/test/java/session_inactive/app.java @@ -17,7 +17,13 @@ public class app extends HttpServlet HttpSession s = request.getSession(); if (s.isNew()) { - s.setMaxInactiveInterval(2); + String interval = request.getHeader("X-Interval"); + + if (interval == null) { + s.setMaxInactiveInterval(0); + } else { + s.setMaxInactiveInterval(Integer.parseInt(interval)); + } } response.addHeader("X-Session-Id", s.getId()); diff --git a/test/test_java_application.py b/test/test_java_application.py index 5d0350fa..54ae3366 100644 --- a/test/test_java_application.py +++ b/test/test_java_application.py @@ -99,12 +99,16 @@ class TestJavaApplication(TestApplicationJava): def test_java_application_session_active(self): self.load('session_inactive') - resp = self.get() + resp = self.get(headers={ + 'X-Interval': '4', + 'Host': 'localhost', + 'Connection': 'close', + }) session_id = resp['headers']['X-Session-Id'] self.assertEqual(resp['status'], 200, 'session init') self.assertEqual( - resp['headers']['X-Session-Interval'], '2', 'session interval' + resp['headers']['X-Session-Interval'], '4', 'session interval' ) self.assertLess( abs( @@ -147,7 +151,7 @@ class TestJavaApplication(TestApplicationJava): resp['headers']['X-Session-Id'], session_id, 'session active 2' ) - time.sleep(1) + time.sleep(2) resp = self.get( headers={ @@ -164,7 +168,11 @@ class TestJavaApplication(TestApplicationJava): def test_java_application_session_inactive(self): self.load('session_inactive') - resp = self.get() + resp = self.get(headers={ + 'X-Interval': '1', + 'Host': 'localhost', + 'Connection': 'close', + }) session_id = resp['headers']['X-Session-Id'] time.sleep(3) |