----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/29242/#review65761 -----------------------------------------------------------
Applying: CLOUDSTACK-8096: Fixed test_ssvm.py for issues while checking the result of diagnostic scripts Using index info to reconstruct a base tree... M test/integration/smoke/test_ssvm.py M tools/marvin/marvin/config/test_data.py Falling back to patching base and 3-way merge... Auto-merging tools/marvin/marvin/config/test_data.py Auto-merging test/integration/smoke/test_ssvm.py CONFLICT (content): Merge conflict in test/integration/smoke/test_ssvm.py Failed to merge in the changes. Patch failed at 0001 CLOUDSTACK-8096: Fixed test_ssvm.py for issues while checking the result of diagnostic scripts 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". - SrikanteswaraRao Talluri On Dec. 19, 2014, 9:58 a.m., Gaurav Aradhye wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/29242/ > ----------------------------------------------------------- > > (Updated Dec. 19, 2014, 9:58 a.m.) > > > Review request for cloudstack and SrikanteswaraRao Talluri. > > > Bugs: CLOUDSTACK-8096 > https://issues.apache.org/jira/browse/CLOUDSTACK-8096 > > > Repository: cloudstack-git > > > Description > ------- > > After reboot SSVM and CPVM operation, if we run diagnostic script on SSVM, it > fails with "NFS server is not currently mounted". Also if we run command > "service cloud status", it says "Cloudstack cloud service is not running". > > But if we check after some time, everything is fine. Some delay in test cases > is needed to allow the SSVM and CPVM to start all services. > > Added the delay as part of configurableData section so that it can be changed > whenever required using external script without touching the test case. > > Also fixed import issues and pep8 issues. > > > Diffs > ----- > > test/integration/smoke/test_ssvm.py 5713569 > tools/marvin/marvin/config/test_data.py 4ab7e56 > > Diff: https://reviews.apache.org/r/29242/diff/ > > > Testing > ------- > > Test List secondary storage VMs ... === TestName: test_01_list_sec_storage_vm > | Status : SUCCESS === > ok > Test List console proxy VMs ... === TestName: test_02_list_cpvm_vm | Status : > SUCCESS === > ok > Test SSVM Internals ... === TestName: test_03_ssvm_internals | Status : > SUCCESS === > ok > Test CPVM Internals ... === TestName: test_04_cpvm_internals | Status : > SUCCESS === > ok > Test stop SSVM ... === TestName: test_05_stop_ssvm | Status : SUCCESS === > ok > Test stop CPVM ... === TestName: test_06_stop_cpvm | Status : SUCCESS === > ok > Test reboot SSVM ... === TestName: test_07_reboot_ssvm | Status : SUCCESS === > ok > Test reboot CPVM ... === TestName: test_08_reboot_cpvm | Status : SUCCESS === > ok > Test destroy SSVM ... === TestName: test_09_destroy_ssvm | Status : SUCCESS > === > ok > Test destroy CPVM ... === TestName: test_10_destroy_cpvm | Status : SUCCESS > === > ok > > ---------------------------------------------------------------------- > Ran 10 tests in 1555.479s > > OK > > > Thanks, > > Gaurav Aradhye > >
