Browse Source

HUE-822 [oozie] Fix tests

Romain Rigaux 13 years ago
parent
commit
3de7ffc

+ 2 - 1
apps/oozie/src/oozie/templates/editor/gen/workflow-common.xml.mako

@@ -34,7 +34,8 @@ import posixpath
                     if not path.startswith('/') and not path.startswith('$') and not path.startswith('hdfs://'):
                       path = '/user/%(username)s/%(path)s' % {'username': '${wf:user()}', 'path': path}
 
-                    path = '%(nameNode)s%(path)s' % {'nameNode': '${nameNode}', 'path': path}
+                    if not path.startswith('hdfs://'):
+                      path = '%(nameNode)s%(path)s' % {'nameNode': '${nameNode}', 'path': path}
                   %>
 
                   <${ operation } path="${ path }"/>

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

@@ -710,9 +710,9 @@ class TestEditor(OozieMockBase):
     xml = self.wf.to_xml()
 
     assert_true('<delete path="${nameNode}${output}"/>' in xml, xml)
-    assert_true(re.search(re.escape('<delete path="${nameNode}/user/${wf:user()}/out"/>'), xml, re.IGNORECASE), xml)
-    assert_true(re.search(re.escape('<delete path="${nameNode}/user/test/out"/>'), xml, re.IGNORECASE), xml)
-    assert_true(re.search(re.escape('<delete path="hdfs://localhost:8020/user/test/out"/>'), xml, re.IGNORECASE), xml)
+    assert_true('<delete path="${nameNode}/user/${wf:user()}/out"/>' in xml, xml)
+    assert_true('<delete path="${nameNode}/user/test/out"/>' in xml, xml)
+    assert_true('<delete path="hdfs://localhost:8020/user/test/out"/>' in xml, xml)
 
 
   def test_get_workflow_parameters(self):