Эх сурвалжийг харах

HUE-8846 [ci] Set more LDAP, FS tests as integration tests

Romain 6 жил өмнө
parent
commit
ee806e500c

+ 2 - 0
apps/beeswax/src/beeswax/test_base.py

@@ -355,6 +355,8 @@ def verify_history(client, fragment, design=None, reverse=False, server_name='be
 
 
 class BeeswaxSampleProvider(object):
+  integration = True
+
   """
   Setup the test db and install sample data
   """

+ 2 - 0
apps/useradmin/src/useradmin/test_ldap.py

@@ -400,6 +400,7 @@ class TestUserAdminLdap(BaseUserAdminTests):
         finish()
 
 
+  @attr('integration')
   def test_useradmin_ldap_user_integration(self):
     if is_live_cluster():
       raise SkipTest('HUE-2897: Skipping because the DB may not be case sensitive')
@@ -506,6 +507,7 @@ class TestUserAdminLdap(BaseUserAdminTests):
         finish()
 
 
+  @attr('integration')
   def test_add_ldap_users(self):
     if is_live_cluster():
       raise SkipTest('HUE-2897: Skipping because the DB may not be case sensitive')

+ 2 - 0
apps/useradmin/src/useradmin/test_ldap_deprecated.py

@@ -412,6 +412,7 @@ class TestUserAdminLdapDeprecated(BaseUserAdminTests):
         finish()
 
 
+  @attr('integration')
   def test_useradmin_ldap_case_sensitivity(self):
     if is_live_cluster():
       raise SkipTest('HUE-2897: Cannot yet guarantee database is case sensitive')
@@ -490,6 +491,7 @@ class TestUserAdminLdapDeprecated(BaseUserAdminTests):
         finish()
 
 
+  @attr('integration')
   def test_add_ldap_users_case_sensitivity(self):
     if is_live_cluster():
       raise SkipTest('HUE-2897: Cannot yet guarantee database is case sensitive')

+ 1 - 1
desktop/core/src/desktop/auth/views_test.py

@@ -498,7 +498,7 @@ class TestRemoteUserLogin(PseudoHdfsTestBase):
 
 
 class TestMultipleBackendLogin(PseudoHdfsTestBase):
-
+  integration = True
   reset = []
   test_username = "test_multiple_login"
 

+ 4 - 0
desktop/core/src/desktop/lib/fs/proxyfs_test.py

@@ -17,6 +17,7 @@
 from __future__ import absolute_import
 
 
+from nose.plugins.attrib import attr
 from nose.tools import assert_raises, assert_false, eq_
 from nose import SkipTest
 
@@ -28,6 +29,7 @@ from desktop.lib.django_test_util import make_logged_in_client
 from desktop.lib.test_utils import add_permission, remove_from_group
 
 
+@attr('integration')
 def test_fs_selection():
   try:
     from mock import MagicMock
@@ -90,6 +92,7 @@ def test__get_fs():
   assert_raises(IOError, f, 'ftp://host')
 
 
+@attr('integration')
 def test_multi_fs_selection():
   try:
     from mock import MagicMock
@@ -163,6 +166,7 @@ class MockFs():
 
   def setuser(self, user):
     self.user = user
+
   def filebrowser_action(self):
     return self._filebrowser_action
 

+ 1 - 1
desktop/core/src/desktop/models.py

@@ -1315,7 +1315,7 @@ class Document2(models.Model):
     if self.can_read(user):
       return True
     else:
-      raise PopupException(_("Document does not exist or you don't have the permission to access it."))
+      raise PopupException(_("Document does not exist or you don't have the permission to access it."), error_code=401)
 
   def can_write(self, user):
     perm = self.get_permission('write')

+ 3 - 2
desktop/core/src/desktop/tests.py

@@ -238,13 +238,14 @@ def test_dump_config():
   response = client_not_me.get(reverse('desktop.views.dump_config'))
   assert_true("You must be a superuser" in response.content, response.content)
 
-  prev_env_conf = os.environ["HUE_CONF_DIR"]
+  prev_env_conf = os.environ.get("HUE_CONF_DIR")
   try:
     os.environ["HUE_CONF_DIR"] = "/tmp/test_hue_conf_dir"
     resp = c.get(reverse('desktop.views.dump_config'))
     assert_true('/tmp/test_hue_conf_dir' in resp.content, resp)
   finally:
-    os.environ["HUE_CONF_DIR"] = prev_env_conf
+    if prev_env_conf is not None:
+      os.environ["HUE_CONF_DIR"] = prev_env_conf
 
 def hue_version():
   global HUE_VERSION