You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/19 06:00:42 UTC
[1/2] git commit: updated refs/heads/master to b6850c2
Updated Branches:
refs/heads/master c8bc7a0af -> b6850c28d
CLOUDSTACK-3021: Correct the order of resources
Resources are ordered so that the cleanup succeeds.
domains are deleted after accounts under the domain are removed.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6850c28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6850c28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6850c28
Branch: refs/heads/master
Commit: b6850c28dc664e88c0128ddbae7c3ee468290350
Parents: 168fb29
Author: Rayees Namathponnan <ra...@citrix.com>
Authored: Tue Jun 18 02:43:52 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jun 19 09:28:16 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6850c28/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index ec135b1..39ff3ea 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -753,13 +753,14 @@ class TestServiceOfferingHierarchy(cloudstackTestCase):
domainid=cls.domain_2.id
)
- cls._cleanup = [
- cls.account_1,
- cls.account_2,
- cls.service_offering,
- cls.domain_1,
- cls.domain_2,
- ]
+ cls._cleanup = [
+ cls.account_2,
+ cls.domain_2,
+ cls.service_offering,
+ cls.account_1,
+ cls.domain_1,
+ ]
+
return
@classmethod
[2/2] git commit: updated refs/heads/master to b6850c2
Posted by ts...@apache.org.
add some logging to NioTest
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/168fb29d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/168fb29d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/168fb29d
Branch: refs/heads/master
Commit: 168fb29d69da3a1bf03498f5070ff656d01cd4c7
Parents: c8bc7a0
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jun 18 16:32:31 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jun 19 09:28:16 2013 +0530
----------------------------------------------------------------------
utils/test/com/cloud/utils/testcase/NioTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/168fb29d/utils/test/com/cloud/utils/testcase/NioTest.java
----------------------------------------------------------------------
diff --git a/utils/test/com/cloud/utils/testcase/NioTest.java b/utils/test/com/cloud/utils/testcase/NioTest.java
index e20532c..3b8fe69 100644
--- a/utils/test/com/cloud/utils/testcase/NioTest.java
+++ b/utils/test/com/cloud/utils/testcase/NioTest.java
@@ -16,20 +16,18 @@
// under the License.
package com.cloud.utils.testcase;
-import java.nio.channels.ClosedChannelException;
-import java.util.Random;
-
-import org.apache.log4j.Logger;
-
import com.cloud.utils.nio.HandlerFactory;
import com.cloud.utils.nio.Link;
import com.cloud.utils.nio.NioClient;
import com.cloud.utils.nio.NioServer;
import com.cloud.utils.nio.Task;
import com.cloud.utils.nio.Task.Type;
-
-import org.junit.Assert;
import junit.framework.TestCase;
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+
+import java.nio.channels.ClosedChannelException;
+import java.util.Random;
/**
*
@@ -83,6 +81,7 @@ public class NioTest extends TestCase {
while (_clientLink == null) {
try {
+ s_logger.debug("Link is not up! Waiting ...");
Thread.sleep(1000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
@@ -94,6 +93,7 @@ public class NioTest extends TestCase {
public void tearDown() {
while (!isTestsDone()) {
try {
+ s_logger.debug(this._completedCount + "/" + this._testCount + " tests done. Waiting for completion");
Thread.sleep(1000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block