> On Dec. 11, 2014, 12:17 p.m., SrikanteswaraRao Talluri wrote: > > doesn't apply cleanly on 4.5 > > > > git am -s > > /Users/talluri/Downloads/0001-CLOUDSTACK-8021-Change-test-cases-to-use-host-inform.patch > > Applying: CLOUDSTACK-8021: Change test cases to use host information from > > configurableData section in test_data.py > > error: patch failed: test/integration/component/test_deploy_vgpu_vm.py:15 > > error: test/integration/component/test_deploy_vgpu_vm.py: patch does not > > apply > > Patch failed at 0001 CLOUDSTACK-8021: Change test cases to use host > > information from configurableData section in test_data.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".
Talluri, try using git am -3. It might resolve. - Rajani ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/28748/#review64718 ----------------------------------------------------------- On Dec. 5, 2014, 2:37 p.m., Gaurav Aradhye wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/28748/ > ----------------------------------------------------------- > > (Updated Dec. 5, 2014, 2:37 p.m.) > > > Review request for cloudstack and SrikanteswaraRao Talluri. > > > Bugs: CLOUDSTACK-8021 > https://issues.apache.org/jira/browse/CLOUDSTACK-8021 > > > Repository: cloudstack-git > > > Description > ------- > > Changing few test cases to use the host username, password from the > configurableData section in test_data.py. Earlier they were reading the hard > coded value. Removed old host_password value from test_data.py > > Also fixed few pep8 issues. > > > Diffs > ----- > > test/integration/component/test_deploy_vgpu_vm.py 0284eab > test/integration/component/test_persistent_networks.py 4b1bc7a > test/integration/smoke/test_deploy_vgpu_enabled_vm.py f13ac92 > > Diff: https://reviews.apache.org/r/28748/diff/ > > > Testing > ------- > > Tested test_persistent_networks.py > Other test cases not testable right now. Change is only in reading the config > value. > > > Thanks, > > Gaurav Aradhye > >
