Bläddra i källkod

HUE-6383 [jobsub] Fix failing tests

krish 8 år sedan
förälder
incheckning
1cf4334
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      apps/jobsub/src/jobsub/tests.py
  2. 1 1
      apps/oozie/src/oozie/utils.py

+ 1 - 1
apps/jobsub/src/jobsub/tests.py

@@ -102,7 +102,7 @@ class TestJobsubWithHadoop(OozieServerProvider):
       HTTP_X_REQUESTED_WITH='XMLHttpRequest')
     assert_equal(response.status_code, 200)
     self.design = Workflow.objects.get(id=self.design.id)
-    assert_equal(self.design.start.get_child('to').get_full_node().files, '[{"name": "test", "dummy": ""}]')
+    assert_equal(self.design.start.get_child('to').get_full_node().files, '[{"dummy": "", "name": "test"}]')
 
   def test_get_design(self):
     response = self.client.get(reverse('jobsub.views.get_design',

+ 1 - 1
apps/oozie/src/oozie/utils.py

@@ -45,7 +45,7 @@ def format_field_value(field, value):
   if field in JSON_FIELDS:
     if isinstance(value, basestring):
       value = json.loads(value)
-    value = [item for item in value if item['name']]
+    value = [item for item in value if isinstance(item, dict) and item.get('name')]
     return json.dumps(value)
   if field in NUMBER_FIELDS_OR_NULL:
     if not isinstance(value, int) and value is not None: