Merge pull request #2269 from ethereum/fixflaky

addfile update

apps/remix-ide-e2e/src/commands/addFile.ts

@@ -16,7 +16,8 @@ class AddFile extends EventEmitter {
 function addFile (browser: NightwatchBrowser, name: string, content: NightwatchContractContent, done: VoidFunction) {
   browser.clickLaunchIcon('udapp')
     .clickLaunchIcon('filePanel')
-    .click('li[data-id="treeViewLitreeViewItemREADME.txt"]') // focus on root directory
+    .waitForElementVisible('li[data-id="treeViewLitreeViewItemREADME.txt"]')
+    .click('li[data-id="treeViewLitreeViewItemREADME.txt"]').pause(1000) // focus on root directory
     .elements('css selector', `li[data-id="treeViewLitreeViewItem${name}"]`, (res) => {
       if (res.value && (res.value as any).length > 0) {
         browser.openFile(name)

apps/remix-ide-e2e/src/tests/remixd.test.ts

@@ -82,13 +82,14 @@ module.exports = {
       .testContracts('test_import_node_modules_with_github_import.sol', sources[4]['test_import_node_modules_with_github_import.sol'], ['ERC20', 'test11'])
   },
   'Static Analysis run with remixd #group3': function (browser) {
-    browser.testContracts('test_static_analysis_with_remixd_and_hardhat.sol', sources[5]['test_static_analysis_with_remixd_and_hardhat.sol'], ['test5'])
+    browser.testContracts('test_static_analysis_with_remixd_and_hardhat.sol', sources[5]['test_static_analysis_with_remixd_and_hardhat.sol'], ['test5']).pause(2000)
       .clickLaunchIcon('solidityStaticAnalysis')
-      .click('#staticanalysisButton button')
+      .click('#staticanalysisButton button').pause(4000)
       .waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () {
         browser
+          .waitForElementVisible('[data-id="staticAnalysisModuleMiscellaneous1"')
           .click('[data-id="staticAnalysisModuleMiscellaneous1"')
-          .waitForElementPresent('.highlightLine16', 60000)
+          .waitForElementVisible('.highlightLine16', 60000)
           .getEditorValue((content) => {
             browser.assert.ok(content.indexOf(
               'function _sendLogPayload(bytes memory payload) private view {') !== -1,

apps/remix-ide-e2e/src/tests/search.test.ts

@@ -44,10 +44,10 @@ module.exports = {
     },
     'Should find regex': function (browser: NightwatchBrowser) {
         browser
-            .waitForElementVisible('*[data-id="search_use_regex"]').click('*[data-id="search_use_regex"]')
             .waitForElementVisible('*[id="search_input"]')
-            .clearValue('*[id="search_input"]')
+            .clearValue('*[id="search_input"]').pause(2000)
-            .setValue('*[id="search_input"]', '^contract').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
+            .setValue('*[id="search_input"]', '^contract').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(3000)
+            .waitForElementVisible('*[data-id="search_use_regex"]').click('*[data-id="search_use_regex"]').pause(3000)
             .waitForElementContainsText('*[data-id="search_results"]', '3_BALLOT.SOL', 60000)
             .waitForElementContainsText('*[data-id="search_results"]', '2_OWNER.SOL', 60000)
             .waitForElementContainsText('*[data-id="search_results"]', '1_STORAGE.SOL', 60000)