You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/01/16 18:31:36 UTC

git commit: Summary: Modifying integration tests to use 128MB service offerings

Updated Branches:
  refs/heads/master 310d35f88 -> 4f479e2b2


Summary: Modifying integration tests to use 128MB service offerings

Detail: The default devcloud tiny template is set up via devcloud.sql to have
at least 100MB RAM, changing the tests as well. This will also allow the builtin
devcloud-kvm tiny template to work for tests as it requires a bit more.

Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1358357431 -0700


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

Branch: refs/heads/master
Commit: 4f479e2b23cbbc42247531bd8abb005fc1b89591
Parents: 310d35f
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Wed Jan 16 10:30:31 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Wed Jan 16 10:30:31 2013 -0700

----------------------------------------------------------------------
 test/integration/smoke/test_routers.py           |    2 +-
 test/integration/smoke/test_service_offerings.py |    2 +-
 test/integration/smoke/test_templates.py         |    2 +-
 test/integration/smoke/test_vm_life_cycle.py     |    2 +-
 test/integration/smoke/test_volumes.py           |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4f479e2b/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 93dc760..435c7e4 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -41,7 +41,7 @@ class Services:
                                     "displaytext": "Tiny Instance",
                                     "cpunumber": 1,
                                     "cpuspeed": 100, # in MHz
-                                    "memory": 64, # In MBs
+                                    "memory": 128, # In MBs
                                     },
                         "virtual_machine":
                                     {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4f479e2b/test/integration/smoke/test_service_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
index 3a8a9e1..7f4d130 100644
--- a/test/integration/smoke/test_service_offerings.py
+++ b/test/integration/smoke/test_service_offerings.py
@@ -39,7 +39,7 @@ class Services:
                                 "displaytext": "Service Offering",
                                 "cpunumber": 1,
                                 "cpuspeed": 100, # MHz
-                                "memory": 64, # in MBs
+                                "memory": 128, # in MBs
                             },
                      }
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4f479e2b/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index d450a5d..663b174 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -52,7 +52,7 @@ class Services:
                                     "displaytext": "Tiny Instance",
                                     "cpunumber": 1,
                                     "cpuspeed": 100,    # in MHz
-                                    "memory": 64,       # In MBs
+                                    "memory": 128,       # In MBs
                         },
                         "disk_offering": {
                                     "displaytext": "Small",

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4f479e2b/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index f6fe4e0..0bd4f95 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -80,7 +80,7 @@ class Services:
                         "displaytext": "Tiny Instance",
                         "cpunumber": 1,
                         "cpuspeed": 100, # in MHz
-                        "memory": 64, # In MBs
+                        "memory": 128, # In MBs
                     },
                  "small":
                     {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4f479e2b/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 2d0cd49..3fe68ec 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -53,7 +53,7 @@ class Services:
                                     "displaytext": "Tiny Instance",
                                     "cpunumber": 1,
                                     "cpuspeed": 100,    # in MHz
-                                    "memory": 64,       # In MBs
+                                    "memory": 128,       # In MBs
                         },
                         "disk_offering": {
                                     "displaytext": "Small",