Browse Source

[impala] Use DocModel API in the tests

Romain Rigaux 12 years ago
parent
commit
4bfe98accc

+ 4 - 0
apps/impala/src/impala/tests.py

@@ -24,6 +24,7 @@ from desktop.lib.django_test_util import make_logged_in_client
 from beeswax.models import SavedQuery, QueryHistory
 from beeswax.server import dbms
 from beeswax.design import hql_query
+from desktop.models import Document
 
 
 class MockDbms:
@@ -95,4 +96,7 @@ def create_saved_query(app_name, owner):
     design.data = hql_query('show $tables', database='db1').dumps()
     design.is_auto = False
     design.save()
+
+    Document.objects.link(design, owner=design.owner, extra=design.type, name=design.name, description=design.desc)
+
     return design

+ 5 - 5
apps/jobbrowser/src/jobbrowser/tests.py

@@ -15,10 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
+
+import json
 import logging
 import re
 import time
@@ -30,12 +28,13 @@ from nose.plugins.skip import SkipTest
 from nose.tools import assert_true, assert_false, assert_equal
 
 from desktop.lib.django_test_util import make_logged_in_client
-from desktop.lib.test_utils import grant_access
+from desktop.lib.test_utils import grant_access, add_to_group
 from hadoop import cluster
 from hadoop.conf import YARN_CLUSTERS
 from hadoop.yarn import resource_manager_api, mapreduce_api, history_server_api
 from liboozie.oozie_api_test import OozieServerProvider
 from oozie.models import Workflow
+from useradmin.models import get_default_user_group
 
 from jobbrowser import models, views
 from jobbrowser.conf import SHARE_JOBS
@@ -96,6 +95,7 @@ class TestJobBrowserWithHadoop(unittest.TestCase, OozieServerProvider):
     grant_access(self.username, 'test', 'jobsub')
     grant_access(self.username, 'test', 'jobbrowser')
     grant_access(self.username, 'test', 'oozie')
+    add_to_group(self.username, get_default_user_group().name)
 
     self.prev_user = self.cluster.fs.user
     self.cluster.fs.setuser(self.username)

+ 3 - 3
apps/oozie/src/oozie/tests.py

@@ -2890,7 +2890,7 @@ class TestUtils(OozieMockBase):
     OozieMockBase.setUp(self)
 
     # When updating wf, update wf_json as well!
-    self.wf = Workflow.objects.get(name='wf-name-1', managed=True)
+    self.wf = Document.objects.get_docs(self.user, Workflow).get(name='wf-name-1').content_object
 
 
   def test_workflow_to_dict(self):
@@ -3030,7 +3030,7 @@ def create_workflow(client, user, workflow_dict=WORKFLOW_DICT):
   assert_equal(200, response.status_code)
   assert_equal(workflow_count + 1, Document.objects.available_docs(Workflow, user).count())
 
-  wf = Workflow.objects.get(name=name)
+  wf = Document.objects.get_docs(user, Workflow).get(name=name).content_object
   assert_not_equal('', wf.deployment_dir)
   assert_true(wf.managed)
 
@@ -3056,7 +3056,7 @@ def create_coordinator(workflow, client, user):
   response = client.post(reverse('oozie:create_coordinator'), post)
   assert_equal(coord_count + 1, Document.objects.available_docs(Coordinator, user).count(), response)
 
-  return Coordinator.objects.get(name=name)
+  return Document.objects.available_docs(Coordinator, user).get(name=name).content_object
 
 
 def create_bundle(client, user):

+ 9 - 0
desktop/core/src/desktop/lib/test_utils.py

@@ -33,3 +33,12 @@ def add_permission(username, groupname, permname, appname):
     if not user.groups.filter(name=group.name).exists():
         user.groups.add(group)
         user.save()
+
+
+def add_to_group(username, groupname):
+    user = User.objects.get(username=username)
+    group, created = Group.objects.get_or_create(name=groupname)
+
+    if not user.groups.filter(name=group.name).exists():
+        user.groups.add(group)
+        user.save()