diff options
| author | Patrick Tasse | 2019-04-09 21:07:32 +0000 |
|---|---|---|
| committer | Patrick Tasse | 2019-04-15 19:45:35 +0000 |
| commit | 411806c7e3ce45737aced58cd34ba3cc4a1e2636 (patch) | |
| tree | 79e612366786fc18c9afce96b9e996470be1cb8e /releng | |
| parent | 25a3da93c6f6a022c89ae34b7b409b1ac74fad9c (diff) | |
| download | org.eclipse.tracecompass-411806c7e3ce45737aced58cd34ba3cc4a1e2636.tar.gz org.eclipse.tracecompass-411806c7e3ce45737aced58cd34ba3cc4a1e2636.tar.xz org.eclipse.tracecompass-411806c7e3ce45737aced58cd34ba3cc4a1e2636.zip | |
swtbot: Fix ProjectExplorerTracesFolderTest
Increase the timeout for active events editor to open. There may be long
delays waiting for the workspace lock and file system operations. Make
sure the editor becomes the active part before continuing.
Enable console logging.
Remove duplicate trace verification in test 3_20.
Change-Id: Ibb7c64c85317f0677abefd88a898f481e80b2a0f
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/140332
Tested-by: CI Bot
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Diffstat (limited to 'releng')
| -rw-r--r-- | releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java index 8277d32fdf..7c1ddda3b8 100644 --- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java +++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2016, 2018 Ericsson + * Copyright (c) 2016, 2019 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -19,8 +19,9 @@ import java.util.List; import java.util.Set; import java.util.function.Supplier; +import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Logger; -import org.apache.log4j.varia.NullAppender; +import org.apache.log4j.SimpleLayout; import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; @@ -177,7 +178,7 @@ public class ProjectExplorerTracesFolderTest { SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */ SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US"; fLogger.removeAllAppenders(); - fLogger.addAppender(new NullAppender()); + fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT)); fBot = new SWTWorkbenchBot(); /* Finish waiting for eclipse to load */ @@ -834,7 +835,6 @@ public class ProjectExplorerTracesFolderTest { int optionFlags = ImportTraceWizardPage.OPTION_CREATE_LINKS_IN_WORKSPACE; importTrace(CUSTOM_TEXT_TRACE_TYPE, optionFlags, ImportConfirmation.SKIP_ALL, ""); - verifyTrace(CUSTOM_TEXT_LOG, optionFlags); final TestTraceInfo[] TEXT_BASED_TRACEINFOS = new TestTraceInfo[] { CUSTOM_TEXT_LOG, |