2 files changed, 18 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java b/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java
index b404747c80..a060d5a57a 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java
@@ -15,5 +15,19 @@
  */
 package com.vaadin.tests.push;
 
+import org.junit.Test;
+
 public class BasicPushLongPollingTest extends BasicPushTest {
+
+    @Test
+    public void pushAfterServerTimeout() throws InterruptedException {
+        getDriver().get(
+                getTestUrl().replace("/run/", "/run-push-timeout/")
+                        + "?debug=push");
+        sleep(11000); // Wait for server timeout (10s)
+
+        getServerCounterStartButton().click();
+        waitUntilServerCounterChanges();
+    }
+
 }
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
index 5bac54f0f7..f176008eb0 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
@@ -57,11 +57,11 @@ public abstract class BasicPushTest extends MultiBrowserTest {
         return Integer.parseInt(clientCounterElem.getText());
     }
 
-    private WebElement getIncrementButton() {
+    protected WebElement getIncrementButton() {
         return getIncrementButton(this);
     }
 
-    private WebElement getServerCounterStartButton() {
+    protected WebElement getServerCounterStartButton() {
         return getServerCounterStartButton(this);
     }
 
@@ -83,7 +83,7 @@ public abstract class BasicPushTest extends MultiBrowserTest {
         return t.vaadinElementById(BasicPush.INCREMENT_BUTTON_ID);
     }
 
-    private void waitUntilClientCounterChanges(final int expectedValue) {
+    protected void waitUntilClientCounterChanges(final int expectedValue) {
         waitUntil(new ExpectedCondition<Boolean>() {
 
             @Override
@@ -93,7 +93,7 @@ public abstract class BasicPushTest extends MultiBrowserTest {
         }, 10);
     }
 
-    private void waitUntilServerCounterChanges() {
+    protected void waitUntilServerCounterChanges() {
         final int counter = BasicPushTest.getServerCounter(this);
         waitUntil(new ExpectedCondition<Boolean>() {