You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/03/02 12:16:11 UTC
[10/10] brooklyn-server git commit: Closes #560
Closes #560
Attempted non-determinate test fixes
Prompted by the following (from https://builds.apache.org/job/brooklyn-server-pull-requests/1730/ ):
```
Test Result (3 failures / +3)
org.apache.brooklyn.launcher.CleanOrphanedLocationsIntegrationTest.testCleanedCopiedPersistedState
org.apache.brooklyn.launcher.CleanOrphanedLocationsIntegrationTest.testSelectionWithOrphanedLocationsInData
org.apache.brooklyn.launcher.BrooklynLauncherTest.testErrorsCaughtByApiAndRestApiWorks
```
The first two have been observed in several places, and might be fixed by the first commit here. The second one is less frequent but the second commit here might help and should improve logging.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b3397aaf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b3397aaf
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b3397aaf
Branch: refs/heads/master
Commit: b3397aaf08e0ba1d43cc989699850e2892f41c78
Parents: 340fdc9 0cfc27b
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Mar 2 14:15:52 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Mar 2 14:15:52 2017 +0200
----------------------------------------------------------------------
.../catalog/internal/BasicBrooklynCatalog.java | 2 +-
.../impl/DeleteOrphanedStateTransformer.java | 8 ++---
.../brooklyn/util/core/file/ArchiveUtils.java | 29 ++++++++++++++--
.../brooklyn/util/core/osgi/BundleMaker.java | 35 +++++++++-----------
.../brooklyn/launcher/common/BasicLauncher.java | 6 ++--
.../brooklyn/launcher/BrooklynLauncher.java | 2 +-
.../brooklyn/launcher/BrooklynWebServer.java | 12 ++++++-
.../brooklyn/launcher/BrooklynLauncherTest.java | 2 +-
.../CleanOrphanedLocationsIntegrationTest.java | 27 +++++++++++++--
.../brooklyn/launcher/WebAppRunnerTest.java | 34 ++++++++-----------
.../util/javalang/LoadedClassLoader.java | 10 +++++-
.../apache/brooklyn/util/net/Networking.java | 8 +++--
.../java/org/apache/brooklyn/util/os/Os.java | 2 +-
13 files changed, 118 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b3397aaf/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------