You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/07/30 19:14:11 UTC
[2/4] git commit: updated refs/heads/master to c9857ca
CLOUDSTACK-8656: code in comment removed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/520e0c8d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/520e0c8d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/520e0c8d
Branch: refs/heads/master
Commit: 520e0c8de04359d55521e6b8271d788edfd46c0e
Parents: 85e002b
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jul 29 23:33:43 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu Jul 30 15:52:17 2015 +0200
----------------------------------------------------------------------
.../api/command/test/AddVpnUserCmdTest.java | 26 --------------------
.../consoleproxy/ConsoleProxyClientBase.java | 12 ---------
2 files changed, 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/520e0c8d/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
----------------------------------------------------------------------
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
index 3755353..c8d99a8 100644
--- a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
+++ b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
@@ -70,32 +70,6 @@ public class AddVpnUserCmdTest extends TestCase {
};
}
- /*
- * @Test public void testExecuteVpnUserNotFound() {
- *
- * EntityManager entityManager = Mockito.mock(EntityManager.class);
- *
- * Mockito.when(entityManager.findById(VpnUser.class,
- * Mockito.anyLong())).thenReturn(null);
- *
- * addVpnUserCmd._entityMgr = entityManager; try { addVpnUserCmd.execute();
- * } catch (Exception e) { }
- *
- * }
- *
- *
- * @Test public void testExecuteVpnUserFound() {
- *
- * EntityManager entityManager = Mockito.mock(EntityManager.class);
- * addVpnUserCmd._entityMgr = entityManager;
- *
- * VpnUser vpnUser = Mockito.mock(VpnUser.class);
- * Mockito.when(entityManager.findById(VpnUser.class,
- * Mockito.anyLong())).thenReturn(vpnUser); addVpnUserCmd.execute();
- *
- * }
- */
-
@Test
public void testCreateSuccess() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/520e0c8d/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
index 6568f4d..e3f2ea0 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
@@ -260,18 +260,6 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons
if (s_logger.isTraceEnabled())
s_logger.trace("Ajax client start, frame buffer w: " + width + ", " + height);
- /*
- int retry = 0;
- tracker.initCoverageTest();
- while(!tracker.hasFullCoverage() && retry < 10) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
- retry++;
- }
- */
-
List<TileInfo> tiles = tracker.scan(true);
String imgUrl = prepareAjaxImage(tiles, true);
String updateUrl = prepareAjaxSession(true);