> On Dec. 20, 2014, 3:51 p.m., SrikanteswaraRao Talluri wrote: > > git am -3s > > /Users/talluri/Downloads/0002-CLOUDSTACK-8098-Fixed-VM-snapshot-issue-in-smoke-tes.patch > > Applying: CLOUDSTACK-8098: Fixed VM snapshot issue in > > smoke/test_vm_snapshots.py > > Using index info to reconstruct a base tree... > > M test/integration/smoke/test_vm_snapshots.py > > Falling back to patching base and 3-way merge... > > Auto-merging test/integration/smoke/test_vm_snapshots.py > > CONFLICT (content): Merge conflict in > > test/integration/smoke/test_vm_snapshots.py > > Failed to merge in the changes. > > Patch failed at 0001 CLOUDSTACK-8098: Fixed VM snapshot issue in > > smoke/test_vm_snapshots.py > > The copy of the patch that failed is found in: > > /Users/talluri/asf/cloudstack/.git/rebase-apply/patch > > When you have resolved this problem, run "git am --continue". > > If you prefer to skip this patch, run "git am --skip" instead. > > To restore the original branch and stop patching, run "git am --abort".
Commit f510ef995baaa9addefc22ff0330cd51dee1dd95 (master )is absent in 4.5. Can you please cherry-pick? - Gaurav ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/29245/#review65734 ----------------------------------------------------------- On Dec. 19, 2014, 5:42 p.m., Gaurav Aradhye wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/29245/ > ----------------------------------------------------------- > > (Updated Dec. 19, 2014, 5:42 p.m.) > > > Review request for cloudstack and SrikanteswaraRao Talluri. > > > Bugs: CLOUDSTACK-8098 > https://issues.apache.org/jira/browse/CLOUDSTACK-8098 > > > Repository: cloudstack-git > > > Description > ------- > > The test case fails while reverting the VM snapshot because the snapshot does > not contain the memory and VM is not in stopped state. > > Solution: > Stop the VM before reverting the snapshot > > Also fixed pep8 issues and imports. > > > Diffs > ----- > > test/integration/smoke/test_vm_snapshots.py 131da99 > > Diff: https://reviews.apache.org/r/29245/diff/ > > > Testing > ------- > > Yes. > > Log: > Test to create VM snapshots ... === TestName: test_01_create_vm_snapshots | > Status : SUCCESS === > ok > Test to revert VM snapshots ... === TestName: test_02_revert_vm_snapshots | > Status : SUCCESS === > ok > Test to delete vm snapshots ... === TestName: test_03_delete_vm_snapshots | > Status : SUCCESS === > ok > > ---------------------------------------------------------------------- > Ran 3 tests in 759.977s > > OK > > > Thanks, > > Gaurav Aradhye > >
