浏览代码

[impala] Remove old way to run integration tests

Romain Rigaux 10 年之前
父节点
当前提交
030fc26
共有 2 个文件被更改,包括 1 次插入13 次删除
  1. 1 5
      apps/impala/src/impala/tests.py
  2. 0 8
      desktop/core/src/desktop/management/commands/test.py

+ 1 - 5
apps/impala/src/impala/tests.py

@@ -109,13 +109,9 @@ class TestImpalaIntegration:
   def setup_class(cls):
   def setup_class(cls):
     cls.finish = []
     cls.finish = []
 
 
-    # We need a real Impala cluster currently
-    if (not 'impala' in sys.argv and not os.environ.get('TEST_IMPALAD_HOST')) or not is_live_cluster():
+    if not is_live_cluster():
       raise SkipTest
       raise SkipTest
 
 
-    if os.environ.get('TEST_IMPALAD_HOST'):
-      cls.finish.append(SERVER_HOST.set_for_testing(os.environ.get('TEST_IMPALAD_HOST')))
-
     cls.client = make_logged_in_client()
     cls.client = make_logged_in_client()
     cls.user = User.objects.get(username='test')
     cls.user = User.objects.get(username='test')
     add_to_group('test')
     add_to_group('test')

+ 0 - 8
desktop/core/src/desktop/management/commands/test.py

@@ -52,8 +52,6 @@ class Command(BaseCommand):
 
 
       windmill   Runs windmill tests
       windmill   Runs windmill tests
 
 
-      impala [hostname]   Runs Impala tests only against a pre-installed Impalad on hostname.
-
     Common useful extra arguments for nose:
     Common useful extra arguments for nose:
       --nologcapture
       --nologcapture
       --nocapture (-s)
       --nocapture (-s)
@@ -87,12 +85,6 @@ class Command(BaseCommand):
 
 
     if args[0] == "all":
     if args[0] == "all":
       nose_args = args + all_apps
       nose_args = args + all_apps
-    elif args[0] == "impala":
-      if len(args) > 1:
-        from impala.conf import SERVER_HOST
-        SERVER_HOST.set_for_testing(args[1])
-      nose_args = ["specific", "impala"]
-      args = ["specific"]
     elif args[0] == "fast":
     elif args[0] == "fast":
       nose_args = args + all_apps + ["-a", "!requires_hadoop"]
       nose_args = args + all_apps + ["-a", "!requires_hadoop"]
     elif args[0] == "windmill":
     elif args[0] == "windmill":