From: Yashodha Chaku <yashodha.chaku@webaccessglobal.com>
Date: Mon, 12 Jan 2015 04:24:05 +0000 (+0530)
Subject: Merge pull request #4887 from pratikshad/broken-webtest
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d36b8b20ac964dc3c0a74f98f580dc7b0ad7383e;p=civicrm-core.git

Merge pull request #4887 from pratikshad/broken-webtest

Fixed broken webtest of Contact and Event
---

d36b8b20ac964dc3c0a74f98f580dc7b0ad7383e
diff --cc tests/phpunit/WebTest/Contact/MergeContactsTest.php
index a74f608d50,2ab2ba4b01..4f74185ae6
--- a/tests/phpunit/WebTest/Contact/MergeContactsTest.php
+++ b/tests/phpunit/WebTest/Contact/MergeContactsTest.php
@@@ -247,10 -247,9 +247,10 @@@ class WebTest_Contact_MergeContactsTes
      $this->waitForElementPresent('_qf_Merge_cancel-bottom');
      $this->click('toggleSelect');
      $this->click('_qf_Merge_next-bottom');
-     $this->waitForPageToLoad($this->getTimeoutMsec());
+     $this->waitForPageToLoad($this->getTimeoutMsec() * 4);
      $this->assertTrue($this->isTextPresent("Staff, Student"));
    }
 +
    /**
     * @param string $firstName
     * @param string $lastName