1 files changed, 14 insertions, 9 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
index 4746939241..545d2412f8 100644
--- a/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
@@ -13,13 +13,18 @@ public class NoLayoutTest extends MultiBrowserTest {
     @Test
     public void testNoLayout() {
         openTestURL();
-        assertCounts(1, 0);
+        // In some situations initial layouting is done in batches. That is OK,
+        // the point of this test is to ensure each subsequent action only
+        // causes expected amount of layouting rounds.
+        int offset = getCount("layoutCount") - 1;
+
+        assertCounts(1 + offset, 0);
 
         $(CheckBoxElement.class).caption("UI polling enabled").first()
                 .findElement(By.tagName("input")).click();
 
         // Toggling check box requires layout
-        assertCounts(2, 0);
+        assertCounts(2 + offset, 0);
 
         try {
             Thread.sleep(2000);
@@ -27,34 +32,34 @@ public class NoLayoutTest extends MultiBrowserTest {
             e.printStackTrace();
         }
         // Count should not change even with polling enabled
-        assertCounts(2, 0);
+        assertCounts(2 + offset, 0);
 
         // Disable polling
         $(CheckBoxElement.class).caption("UI polling enabled").first()
                 .findElement(By.tagName("input")).click();
         // Toggling checkbox layotus again
-        assertCounts(3, 0);
+        assertCounts(3 + offset, 0);
 
         $(ButtonElement.class).caption("Change regular state").first().click();
         // Updating normal state layouts
-        assertCounts(4, 0);
+        assertCounts(4 + offset, 0);
 
         $(ButtonElement.class).caption("Change @NoLayout state").first();
         // Updating @NoLayout state does not layout
-        assertCounts(4, 0);
+        assertCounts(4 + offset, 0);
 
         $(ButtonElement.class).caption("Do regular RPC").first().click();
         // Doing normal RPC layouts
-        assertCounts(5, 0);
+        assertCounts(5 + offset, 0);
 
         $(ButtonElement.class).caption("Do @NoLayout RPC").first().click();
         // Doing @NoLayout RPC does not layout, but updates the RPC count
-        assertCounts(5, 1);
+        assertCounts(5 + offset, 1);
 
         $(ButtonElement.class).caption("Update LegacyComponent").first()
                 .click();
         // Painting LegacyComponent layouts
-        assertCounts(6, 1);
+        assertCounts(6 + offset, 1);
     }
 
     private void assertCounts(int layoutCount, int rpcCount) {