lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed broken test.

Browse Source
This commit is contained in:
Kai Zimmermann
2016-03-29 15:37:07 +02:00
parent db12385d8d
commit 7d3d4f1fd4
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java
View File

@@ -85,9 +85,9 @@ public class PreAuthTokenSourceTrustAuthenticationProviderTest {
when(webAuthenticationDetailsMock.getRemoteAddress()).thenReturn(remoteAddress); when(webAuthenticationDetailsMock.getRemoteAddress()).thenReturn(remoteAddress);
// test, should throw authentication exception // test, should throw authentication exception
final Authentication authenticate = underTestWithSourceIpCheck.authenticate(token);
try { try {
assertThat(authenticate.isAuthenticated()).isTrue(); underTestWithSourceIpCheck.authenticate(token);
fail("as source is not trusted."); fail("as source is not trusted.");
} catch (final InsufficientAuthenticationException e) { } catch (final InsufficientAuthenticationException e) {

2
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java
View File

@@ -379,7 +379,6 @@ public class ControllerManagement {
handleErrorOnAction(mergedAction, mergedTarget); handleErrorOnAction(mergedAction, mergedTarget);
break; break;
case FINISHED: case FINISHED:
handleFinishedAndStoreInTargetStatus(mergedTarget, mergedAction); handleFinishedAndStoreInTargetStatus(mergedTarget, mergedAction);
break; break;
case CANCELED: case CANCELED:
@@ -399,7 +398,6 @@ public class ControllerManagement {
} }
private void handleErrorOnAction(final Action mergedAction, final Target mergedTarget) { private void handleErrorOnAction(final Action mergedAction, final Target mergedTarget) {
// set action inactive
mergedAction.setActive(false); mergedAction.setActive(false);
mergedAction.setStatus(Status.ERROR); mergedAction.setStatus(Status.ERROR);
mergedTarget.setAssignedDistributionSet(null); mergedTarget.setAssignedDistributionSet(null);