cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/master to 867c894
Date Wed, 25 Jun 2014 12:40:28 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 83f2bb5ac -> 867c894d2


Re-enabling fixed test case test_primary_storage.py

Conflicts:

	test/integration/smoke/test_primary_storage.py


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/867c894d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/867c894d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/867c894d

Branch: refs/heads/master
Commit: 867c894d27d2d891bf2169a2f9feafbf7a24d596
Parents: 83f2bb5
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Wed Jun 25 18:05:26 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Wed Jun 25 18:08:36 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_primary_storage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/867c894d/test/integration/smoke/test_primary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py
index 2904d02..0312ad6 100644
--- a/test/integration/smoke/test_primary_storage.py
+++ b/test/integration/smoke/test_primary_storage.py
@@ -144,7 +144,7 @@ class TestPrimaryStorageServices(cloudstackTestCase):
             return
 
 
-    @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")

+    @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
     def test_01_primary_storage_iscsi(self):
         """Test primary storage pools - XEN, KVM, VMWare
         """


Mime
View raw message