Sfoglia il codice sorgente

HUE-8758 [connectors] Configure some tests to be able to run on master

Romain 5 anni fa
parent
commit
b48c976b34

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

@@ -308,7 +308,7 @@ class TestUserAdmin(BaseUserAdminTests):
 
     # Make sure that a superuser can always access applications
     response = c.get('/useradmin/users')
-    assert_true(b'Hue Users' in response.content)
+    assert_true(b'Users' in response.content)
 
     assert_true(len(GroupPermission.objects.all()) == 0)
     c.post('/useradmin/groups/edit/test-group',
@@ -381,7 +381,7 @@ class TestUserAdmin(BaseUserAdminTests):
     # Check that we have access now
     response = c1.get('/useradmin/users')
     assert_true(get_profile(test_user).has_hue_permission('access','useradmin'))
-    assert_true(b'Hue Users' in response.content)
+    assert_true(b'Users' in response.content)
 
     # Make sure we can't modify permissions
     response = c1.get('/useradmin/permissions/edit/useradmin/access')
@@ -465,7 +465,7 @@ class TestUserAdmin(BaseUserAdminTests):
     response = c.get('/useradmin/groups')
     # No groups just yet
     assert_true(len(response.context[0]["groups"]) == 0)
-    assert_true(b"Hue Groups" in response.content)
+    assert_true(b"Groups" in response.content)
 
     # Create a group
     response = c.get('/useradmin/groups/new')

+ 15 - 0
desktop/core/src/desktop/lib/connectors/tests.py

@@ -20,6 +20,7 @@ import sys
 from nose.tools import assert_equal, assert_true, assert_false
 
 from desktop.auth.backend import rewrite_user
+from desktop.conf import ENABLE_CONNECTORS
 from desktop.lib.connectors.api import _get_installed_connectors
 from desktop.lib.django_test_util import make_logged_in_client
 
@@ -69,6 +70,20 @@ class TestConnectorListing():
     self.alone_user = User.objects.get(username='test_alone')
     self.alone_user = rewrite_user(self.alone_user)
 
+  @classmethod
+  def setUpClass(cls):
+    cls._class_resets = [
+      ENABLE_CONNECTORS.set_for_testing(True),
+    ]
+
+  @classmethod
+  def tearDownClass(cls):
+    for reset in cls._class_resets:
+      reset()
+
+    update_app_permissions()
+
+
   @patch('desktop.lib.connectors.models.CONNECTOR_INSTANCES', None)
   def test_get_installed_editor_connectors(self):