You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/17 03:22:23 UTC
git commit: try to fix CI failures
Repository: archiva
Updated Branches:
refs/heads/master 213296539 -> 2b4fc9805
try to fix CI failures
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/2b4fc980
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/2b4fc980
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/2b4fc980
Branch: refs/heads/master
Commit: 2b4fc980517bbb44c5f2edf1c2f2f0a554ddbee4
Parents: 2132965
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 17 11:22:14 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 17 11:22:14 2014 +1000
----------------------------------------------------------------------
.../apache/archiva/remotedownload/DownloadMergedIndexTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/2b4fc980/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
index d338de5..3a89d0e 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
@@ -165,6 +165,12 @@ public class DownloadMergedIndexTest
remoteRepository.setUserName( RedbackRoleConstants.ADMINISTRATOR_ACCOUNT_NAME );
remoteRepository.setPassword( FakeCreateAdminService.ADMIN_TEST_PWD );
+
+ if (getRemoteRepositoriesService().getRemoteRepository( remoteRepository.getId() ) != null)
+ {
+ getRemoteRepositoriesService().deleteRemoteRepository( remoteRepository.getId() );
+ }
+
getRemoteRepositoriesService().addRemoteRepository( remoteRepository );
ProxyConnectorService proxyConnectorService = getProxyConnectorService();