瀏覽代碼

HUE-8846 [ci] Fix environment of last non standard unit tests

Romain 6 年之前
父節點
當前提交
9270d00de4

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

@@ -565,6 +565,7 @@ class TestMultipleBackendLogin(PseudoHdfsTestBase):
 
 
 class TestMultipleBackendLoginNoHadoop(object):
+  integration = True
   reset = []
   test_username = "test_mlogin_no_hadoop"
 

+ 3 - 2
desktop/core/src/desktop/management/commands/test_windmill.py → desktop/core/src/desktop/management/commands/run_windmill.py

@@ -22,9 +22,10 @@ import sys
 import time
 from optparse import make_option
 
-from django.core.management.base import BaseCommand
 from windmill.authoring import djangotest
 
+from django.core.management.base import BaseCommand
+
 import logging
 
 LOG = logging.getLogger(__name__)
@@ -123,7 +124,7 @@ class Command(BaseCommand):
       sys.exit(0)
     else:
       sys.exit(1)
-  
+
   def find_modules(self):
     """Find modules ending in windmilltests within installed apps."""
     import django.conf

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

@@ -244,9 +244,12 @@ def test_dump_config():
     resp = c.get(reverse('desktop.views.dump_config'))
     assert_true('/tmp/test_hue_conf_dir' in resp.content, resp)
   finally:
-    if prev_env_conf is not None:
+    if prev_env_conf is None:
+      os.environ.pop("HUE_CONF_DIR", None)
+    else:
       os.environ["HUE_CONF_DIR"] = prev_env_conf
 
+
 def hue_version():
   global HUE_VERSION
   HUE_VERSION_BAK = HUE_VERSION
@@ -766,7 +769,7 @@ def test_config_check():
         for old_conf in reset:
           old_conf()
 
-      prev_env_conf = os.environ["HUE_CONF_DIR"]
+      prev_env_conf = os.environ.get("HUE_CONF_DIR")
       try:
         # Set HUE_CONF_DIR and make sure check_config returns appropriate conf
         os.environ["HUE_CONF_DIR"] = "/tmp/test_hue_conf_dir"
@@ -781,7 +784,10 @@ def test_config_check():
         resp = cli.get('/desktop/debug/check_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 None:
+          os.environ.pop("HUE_CONF_DIR", None)
+        else:
+          os.environ["HUE_CONF_DIR"] = prev_env_conf
         desktop.views.validate_by_spec = desktop.views.real_validate_by_spec
 
 def test_last_access_time():