You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/01 13:27:47 UTC
[1/2] git commit: updated refs/heads/master to 996c2f6
Repository: cloudstack
Updated Branches:
refs/heads/master 3ded3e900 -> 996c2f6dd
CLOUDSTACK-8924: Removed duplicate test from test_scale_vm.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33bdfc77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33bdfc77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33bdfc77
Branch: refs/heads/master
Commit: 33bdfc773a39d7ff245fb4f50299a7b6cc0391ef
Parents: 3ded3e9
Author: sanjeev <sa...@apache.org>
Authored: Wed Sep 30 15:23:30 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed Sep 30 15:23:30 2015 +0530
----------------------------------------------------------------------
test/integration/smoke/test_scale_vm.py | 76 +---------------------------
1 file changed, 2 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33bdfc77/test/integration/smoke/test_scale_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
index 0a0f415..e4d7b40 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -118,7 +118,7 @@ class TestScaleVm(cloudstackTestCase):
return
@attr(hypervisor="xenserver")
- @attr(tags=["advanced", "basic"], required_hardware="true")
+ @attr(tags=["advanced", "basic"], required_hardware="false")
def test_01_scale_vm(self):
"""Test scale virtual machine
"""
@@ -202,76 +202,4 @@ class TestScaleVm(cloudstackTestCase):
'Running',
"Check the state of VM"
)
- return
-
- @attr(tags=["advanced", "basic"], required_hardware="false")
- def test_02_scale_vm_without_hypervisor_specifics(self):
- # Validate the following
- # Scale up the vm and see if it scales to the new svc offering and is
- # finally in running state
-
- # VirtualMachine should be updated to tell cloudstack
- # it has PV tools
- # available and successfully scaled. We will only mock
- # that behaviour
- # here but it is not expected in production since the VM
- # scaling is not
- # guaranteed until tools are installed, vm rebooted
-
- self.virtual_machine.update(
- self.apiclient,
- isdynamicallyscalable='true')
-
- self.debug("Scaling VM-ID: %s to service offering: %s and state %s" % (
- self.virtual_machine.id,
- self.big_offering.id,
- self.virtual_machine.state
- ))
-
- cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
- cmd.serviceofferingid = self.big_offering.id
- cmd.id = self.virtual_machine.id
- self.apiclient.scaleVirtualMachine(cmd)
-
- list_vm_response = VirtualMachine.list(
- self.apiclient,
- id=self.virtual_machine.id
- )
- self.assertEqual(
- isinstance(list_vm_response, list),
- True,
- "Check list response returns a valid list"
- )
-
- self.assertNotEqual(
- list_vm_response,
- None,
- "Check virtual machine is in listVirtualMachines"
- )
-
- vm_response = list_vm_response[0]
- self.assertEqual(
- vm_response.id,
- self.virtual_machine.id,
- "Check virtual machine ID of scaled VM"
- )
-
- self.debug(
- "Scaling VM-ID: %s from service offering: %s to new service\
- offering %s and the response says %s" %
- (self.virtual_machine.id,
- self.virtual_machine.serviceofferingid,
- self.big_offering.id,
- vm_response.serviceofferingid))
- self.assertEqual(
- vm_response.serviceofferingid,
- self.big_offering.id,
- "Check service offering of the VM"
- )
-
- self.assertEqual(
- vm_response.state,
- 'Running',
- "Check the state of VM"
- )
- return
+ return
\ No newline at end of file
[2/2] git commit: updated refs/heads/master to 996c2f6
Posted by re...@apache.org.
Merge pull request #900 from sanju1010/scale_vm
CLOUDSTACK-8924: Removed duplicate test from test_scale_vm.pyPlease go through CS-8924 for more details.
* pr/900:
CLOUDSTACK-8924: Removed duplicate test from test_scale_vm.py
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/996c2f6d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/996c2f6d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/996c2f6d
Branch: refs/heads/master
Commit: 996c2f6ddec57fd5a644f6454911a1e303cc7d8f
Parents: 3ded3e9 33bdfc7
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Oct 1 13:26:41 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Oct 1 13:26:41 2015 +0200
----------------------------------------------------------------------
test/integration/smoke/test_scale_vm.py | 76 +---------------------------
1 file changed, 2 insertions(+), 74 deletions(-)
----------------------------------------------------------------------