From 3fc263d547515fa4fac8731999b552389924b6bc Mon Sep 17 00:00:00 2001
From: isabelrios <isabelrios@gmail.com>
Date: Tue, 12 Nov 2019 18:19:25 +0100
Subject: [PATCH] fix reviewer comments

---
 .../org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt
index 26af5901b..14c1fac23 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt
@@ -70,13 +70,14 @@ class SyncIntegrationTest {
         // currently is not possible to select each one (History/Bookmark) and verify its status
         // verifyCheckBoxesSelected()
         // Then select/unselect each one and verify again that its status is correct
+        // See issue #6544
         accountSettings {
             verifyBookmarksCheckbox()
             verifyHistoryCheckbox()
             verifySignOutButton()
             verifyDeviceName()
         }.disconnectAccount {
-            sleep(TestAssetHelper.waitingTime)
+            mDevice.waitNotNull(Until.findObjects(By.text("Settings")), TestAssetHelper.waitingTime)
             verifySettingsView()
         }
     }
@@ -160,7 +161,7 @@ class SyncIntegrationTest {
     }
 
     fun tapReturnToPreviousApp() {
-        sleep(TestAssetHelper.waitingTime)
+        mDevice.waitNotNull(Until.findObjects(By.text("Settings")), TestAssetHelper.waitingTime)
         mDevice.pressBack()
     }