You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2015/07/01 18:17:57 UTC
[2/2] jclouds-labs git commit: [azurecompute] fix JCLOUDS-952
[azurecompute] fix JCLOUDS-952
fix RoleInstanceHandler when Role is suspended
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/431f07be
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/431f07be
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/431f07be
Branch: refs/heads/master
Commit: 431f07beb91b9c3de7a5bcdb671acc4a8c0906d6
Parents: 8d45b07
Author: Andrea Turli <an...@gmail.com>
Authored: Wed Jul 1 17:27:42 2015 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Wed Jul 1 18:12:32 2015 +0200
----------------------------------------------------------------------
.../compute/AzureComputeServiceContextLiveTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/431f07be/azurecompute/src/test/java/org/jclouds/azurecompute/compute/AzureComputeServiceContextLiveTest.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/compute/AzureComputeServiceContextLiveTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/compute/AzureComputeServiceContextLiveTest.java
index 4f438ef..fb4d79a 100644
--- a/azurecompute/src/test/java/org/jclouds/azurecompute/compute/AzureComputeServiceContextLiveTest.java
+++ b/azurecompute/src/test/java/org/jclouds/azurecompute/compute/AzureComputeServiceContextLiveTest.java
@@ -19,7 +19,6 @@ package org.jclouds.azurecompute.compute;
import static org.assertj.core.api.Assertions.assertThat;
<<<<<<< HEAD
import static org.testng.Assert.assertTrue;
-
import java.util.Arrays;
=======
import static org.jclouds.util.Predicates2.retry;
@@ -29,6 +28,7 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
+<<<<<<< HEAD
import org.jclouds.azurecompute.AzureComputeApi;
import org.jclouds.azurecompute.compute.config.AzureComputeServiceContextModule;
import org.jclouds.azurecompute.domain.Role;
@@ -39,6 +39,11 @@ import org.jclouds.azurecompute.AzureComputeApi;
import org.jclouds.azurecompute.internal.BaseAzureComputeApiLiveTest;
=======
>>>>>>> 0e31d0a... [azurecompute] fix RoleInstanceHandler when Role is suspended
+=======
+import org.jclouds.azurecompute.AzureComputeApi;
+import org.jclouds.azurecompute.internal.BaseAzureComputeApiLiveTest;
+import org.jclouds.azurecompute.options.AzureComputeTemplateOptions;
+>>>>>>> 5ff5bb2... [azurecompute] fix JCLOUDS-952
import org.jclouds.azurecompute.util.ConflictManagementPredicate;
import org.jclouds.compute.RunNodesException;
import org.jclouds.compute.domain.ExecResponse;
@@ -114,6 +119,7 @@ public class AzureComputeServiceContextLiveTest extends BaseComputeServiceContex
*/
@Test
public void testLaunchNode() throws RunNodesException {
+
final String groupName = String.format("%s%d-group-acsclt",
System.getProperty("user.name"),
new Random(999).nextInt());