[Kimchi-devel] [PATCH 2/3] model test for updating template

[Zhou Zheng Sheng]

Hi Christy,

I only found some indentation errors when running pep8 on this file.
Maybe you can run a pep8 check manually and fix those problems. For the
code itself, I think it's good.

on 2014/10/24 04:57, Christy Perez wrote:
> Signed-off-by: Christy Perez <christy at linux.vnet.ibm.com>
> ---
>  tests/test_model.py | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
> 
> diff --git a/tests/test_model.py b/tests/test_model.py
> index e407fe5..b759667 100644
> --- a/tests/test_model.py
> +++ b/tests/test_model.py
> @@ -800,6 +800,31 @@ def test_template_update(self):
>              self.assertRaises(InvalidParameter, inst.template_update,
>                                'new-test', params)
> 
> +    @unittest.skipUnless(utils.running_as_root(), 'Must be run as root')
> +    def test_template_update_cpu_info(self):
> +        inst = model.Model(None,
> +                           objstore_loc=self.tmp_store)
> +        with RollbackContext() as rollback:
> +
> +            params = {'name': 'test', 'memory': 1024, 'cpus': 1,
> +                           'cdrom': self.kimchi_iso}
> +            inst.templates_create(params)
> +            rollback.prependDefer(inst.template_delete, 'test')
> +
> +            # topology and cpus aren't compatible:
> +            params['cpu_info'] = {'topology':
> +                            {'sockets': 1, 'cores': 1, 'threads': 2}}
> +            self.assertRaises(InvalidParameter, inst.template_update, 'test',\
> +                             params)
> +
> +            # Now the update should work:
> +            params['cpus'] = 2
> +            inst.template_update('test', params)
> +
> +            info = inst.template_lookup('test')
> +            for key in params.keys():
> +                self.assertEquals(params[key], info[key])
> +
>      def test_vm_edit(self):
>          inst = model.Model(None,
>                             objstore_loc=self.tmp_store)
> 


-- 
Zhou Zheng Sheng / 周征晟
E-mail: zhshzhou at linux.vnet.ibm.com
Telephone: 86-10-82454397