Explorar o código

[oozie] Make sure to also install the latest Oozie examples when running tests

Romain Rigaux %!s(int64=10) %!d(string=hai) anos
pai
achega
462fa24

+ 10 - 0
apps/oozie/src/oozie/management/commands/oozie_setup.py

@@ -41,11 +41,14 @@ LOG = logging.getLogger(__name__)
 class Command(NoArgsCommand):
 
   def _import_workflows(self, directory, managed=True):
+
     for example_directory_name in os.listdir(directory):
       if os.path.isdir(os.path.join(directory, example_directory_name)):
         with open(os.path.join(directory, example_directory_name, 'workflow.zip')) as fp:
           workflow_xml, metadata = Workflow.decompress(fp)
+
         workflow_root = etree.fromstring(workflow_xml)
+
         try:
           Workflow.objects.get(name=workflow_root.get('name'), managed=managed)
         except Workflow.DoesNotExist:
@@ -61,11 +64,14 @@ class Command(NoArgsCommand):
           workflow.doc.all().delete() # Delete doc as it messes up the example sharing
 
   def _import_coordinators(self, directory):
+
     for example_directory_name in os.listdir(directory):
       if os.path.isdir(os.path.join(directory, example_directory_name)):
         with open(os.path.join(directory, example_directory_name, 'coordinator.zip')) as fp:
           coordinator_xml, metadata = Coordinator.decompress(fp)
+
         coordinator_root = etree.fromstring(coordinator_xml)
+
         try:
           Coordinator.objects.get(name=coordinator_root.get('name'))
         except Coordinator.DoesNotExist:
@@ -77,11 +83,15 @@ class Command(NoArgsCommand):
           import_coordinator_root(coordinator=coordinator, coordinator_definition_root=coordinator_root, metadata=metadata)
 
   def _import_bundles(self, directory):
+
     for example_directory_name in os.listdir(directory):
+
       if os.path.isdir(os.path.join(directory, example_directory_name)):
         with open(os.path.join(directory, example_directory_name, 'bundle.zip')) as fp:
           bundle_xml, metadata = Bundle.decompress(fp)
+
         bundle_root = etree.fromstring(bundle_xml)
+
         try:
           Bundle.objects.get(name=bundle_root.get('name'))
         except Bundle.DoesNotExist:

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

@@ -333,7 +333,10 @@ class OozieBase(OozieServerProvider):
     if _INITIALIZED:
       return
 
+    reset = ENABLE_V2.set_for_testing(True) # Somewhere this is reseted
     self.c.post(reverse('oozie:install_examples'))
+    reset()
+
     self.cluster.fs.do_as_user('test', self.cluster.fs.create_home_dir, '/user/test')
 
     _INITIALIZED = True

+ 7 - 7
desktop/libs/liboozie/src/liboozie/oozie_api_tests.py

@@ -189,17 +189,17 @@ class OozieServerProvider(object):
         else:
           LOG.info('\nStarting a Mini Oozie. Requires "tools/jenkins/jenkins.sh" to be previously ran.\n')
           LOG.info('See https://issues.cloudera.org/browse/HUE-861\n')
-  
+
           finish = (
             OOZIE_URL.set_for_testing("http://%s:%s/oozie" % (socket.getfqdn(), OozieServerProvider.OOZIE_TEST_PORT)),
           )
-  
-          # Setup          
+
+          # Setup
           cls._setup_sharelib()
           cls._reset_oozie(cluster)
-  
+
           p = cls._start_oozie(cluster)
-  
+
           def kill():
             LOG.info("Killing Oozie server (pid %d)." % p.pid)
             os.kill(p.pid, 9)
@@ -214,7 +214,7 @@ class OozieServerProvider(object):
         start = time.time()
         started = False
         sleep = 0.01
-          
+
         while not started and time.time() - start < 30.0:
           status = None
           try:
@@ -253,4 +253,4 @@ class TestMiniOozie(OozieServerProvider):
     if is_live_cluster():
       assert_true(self.cluster.fs.exists('/user/oozie/share/lib'))
     else:
-      assert_true(self.cluster.fs.exists('/user/%(user)s/share/lib' % {'user': user}))  
+      assert_true(self.cluster.fs.exists('/user/%(user)s/share/lib' % {'user': user}))