[Kimchi-devel] [PATCH] [Kimchi] Fix patch_auth() call according to Wok changes

Aline Manera posted 1 patch 4 years, 2 months ago
Failed in applying to current master (apply log)
mockmodel.py                |  2 --
tests/test_authorization.py | 19 ++++++++++---------
2 files changed, 10 insertions(+), 11 deletions(-)

[Kimchi-devel] [PATCH] [Kimchi] Fix patch_auth() call according to Wok changes

Posted by Aline Manera 4 years, 2 months ago
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com>
---
 mockmodel.py                |  2 --
 tests/test_authorization.py | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/mockmodel.py b/mockmodel.py
index 9e27d3f..192979f 100644
--- a/mockmodel.py
+++ b/mockmodel.py
@@ -56,8 +56,6 @@ from wok.plugins.kimchi.model.vmhostdevs import VMHostDevsModel
 from wok.plugins.kimchi.utils import get_next_clone_name, pool_name_from_uri
 from wok.plugins.kimchi.vmtemplate import VMTemplate
 
-
-fake_user = {'root': 'letmein!'}
 mockmodel_defaults = {
     'domain': 'test', 'arch': 'i686'
 }
diff --git a/tests/test_authorization.py b/tests/test_authorization.py
index b67d8d6..664e017 100644
--- a/tests/test_authorization.py
+++ b/tests/test_authorization.py
@@ -19,16 +19,16 @@
 
 import cherrypy
 import json
+import mock
 import os
 import unittest
 from functools import partial
 
-from tests.utils import get_fake_user, patch_auth
+from tests.utils import patch_auth
 from tests.utils import request, run_server, wait_task
 
 from iso_gen import construct_fake_iso
 
-
 test_server = None
 model = None
 fake_iso = '/tmp/fake.iso'
@@ -37,7 +37,7 @@ fake_iso = '/tmp/fake.iso'
 def setUpModule():
     global test_server, model
 
-    patch_auth(sudo=False)
+    patch_auth()
     test_server = run_server(test_mode=True)
     model = cherrypy.tree.apps['/plugins/kimchi'].root.model
 
@@ -52,10 +52,13 @@ def tearDownModule():
 
 class AuthorizationTests(unittest.TestCase):
     def setUp(self):
-        self.request = partial(request)
+        self.request = partial(request, user='user')
         model.reset()
 
-    def test_nonroot_access(self):
+    @mock.patch('wok.plugins.kimchi.model.users.PAMUsersModel._validate')
+    def test_nonroot_access(self, validate_users):
+        validate_users.return_value = True
+
         # Non-root users can not create or delete network (only get)
         resp = self.request('/plugins/kimchi/networks', '{}', 'GET')
         self.assertEquals(200, resp.status)
@@ -102,10 +105,8 @@ class AuthorizationTests(unittest.TestCase):
         })
         wait_task(model.task_lookup, task_info['id'])
 
-        fake_user = get_fake_user()
-
         model.vm_update(u'test-me',
-                        {'users': [fake_user.keys()[0]],
+                        {'users': ['user'],
                          'groups': []})
 
         task_info = model.vms_create({
@@ -114,7 +115,7 @@ class AuthorizationTests(unittest.TestCase):
         })
         wait_task(model.task_lookup, task_info['id'])
 
-        non_root = list(set(model.users_get_list()) - set(['root']))[0]
+        non_root = list(set(model.users_get_list()) - set(['admin']))[0]
         model.vm_update(u'test-usera', {'users': [non_root], 'groups': []})
 
         task_info = model.vms_create({
-- 
2.9.3

_______________________________________________
Kimchi-devel mailing list
Kimchi-devel@ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel

Re: [Kimchi-devel] [PATCH] [Kimchi] Fix patch_auth() call according to Wok changes

Posted by Lucio Correia 4 years, 2 months ago
Reviewed-By: Lucio Correia <luciojhc@linux.vnet.ibm.com>

On 16/02/2017 15:22, Aline Manera wrote:
> Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com>
> ---
>  mockmodel.py                |  2 --
>  tests/test_authorization.py | 19 ++++++++++---------
>  2 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/mockmodel.py b/mockmodel.py
> index 9e27d3f..192979f 100644
> --- a/mockmodel.py
> +++ b/mockmodel.py
> @@ -56,8 +56,6 @@ from wok.plugins.kimchi.model.vmhostdevs import VMHostDevsModel
>  from wok.plugins.kimchi.utils import get_next_clone_name, pool_name_from_uri
>  from wok.plugins.kimchi.vmtemplate import VMTemplate
>
> -
> -fake_user = {'root': 'letmein!'}
>  mockmodel_defaults = {
>      'domain': 'test', 'arch': 'i686'
>  }
> diff --git a/tests/test_authorization.py b/tests/test_authorization.py
> index b67d8d6..664e017 100644
> --- a/tests/test_authorization.py
> +++ b/tests/test_authorization.py
> @@ -19,16 +19,16 @@
>
>  import cherrypy
>  import json
> +import mock
>  import os
>  import unittest
>  from functools import partial
>
> -from tests.utils import get_fake_user, patch_auth
> +from tests.utils import patch_auth
>  from tests.utils import request, run_server, wait_task
>
>  from iso_gen import construct_fake_iso
>
> -
>  test_server = None
>  model = None
>  fake_iso = '/tmp/fake.iso'
> @@ -37,7 +37,7 @@ fake_iso = '/tmp/fake.iso'
>  def setUpModule():
>      global test_server, model
>
> -    patch_auth(sudo=False)
> +    patch_auth()
>      test_server = run_server(test_mode=True)
>      model = cherrypy.tree.apps['/plugins/kimchi'].root.model
>
> @@ -52,10 +52,13 @@ def tearDownModule():
>
>  class AuthorizationTests(unittest.TestCase):
>      def setUp(self):
> -        self.request = partial(request)
> +        self.request = partial(request, user='user')
>          model.reset()
>
> -    def test_nonroot_access(self):
> +    @mock.patch('wok.plugins.kimchi.model.users.PAMUsersModel._validate')
> +    def test_nonroot_access(self, validate_users):
> +        validate_users.return_value = True
> +
>          # Non-root users can not create or delete network (only get)
>          resp = self.request('/plugins/kimchi/networks', '{}', 'GET')
>          self.assertEquals(200, resp.status)
> @@ -102,10 +105,8 @@ class AuthorizationTests(unittest.TestCase):
>          })
>          wait_task(model.task_lookup, task_info['id'])
>
> -        fake_user = get_fake_user()
> -
>          model.vm_update(u'test-me',
> -                        {'users': [fake_user.keys()[0]],
> +                        {'users': ['user'],
>                           'groups': []})
>
>          task_info = model.vms_create({
> @@ -114,7 +115,7 @@ class AuthorizationTests(unittest.TestCase):
>          })
>          wait_task(model.task_lookup, task_info['id'])
>
> -        non_root = list(set(model.users_get_list()) - set(['root']))[0]
> +        non_root = list(set(model.users_get_list()) - set(['admin']))[0]
>          model.vm_update(u'test-usera', {'users': [non_root], 'groups': []})
>
>          task_info = model.vms_create({
>


-- 
Lucio Correia

_______________________________________________
Kimchi-devel mailing list
Kimchi-devel@ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel