Prechádzať zdrojové kódy

HUE-4621 [core] Fix tests due to closed stdout handle

Jenny Kim 9 rokov pred
rodič
commit
5502082122
1 zmenil súbory, kde vykonal 7 pridanie a 9 odobranie
  1. 7 9
      desktop/core/src/desktop/api2.py

+ 7 - 9
desktop/core/src/desktop/api2.py

@@ -437,20 +437,18 @@ def import_documents(request):
   stdout = StringIO.StringIO()
   try:
     management.call_command('loaddata', f.name, verbosity=2, traceback=True, stdout=stdout)
+    Document.objects.sync()
+
+    if request.POST.get('redirect'):
+      return redirect(request.POST.get('redirect'))
+    else:
+      return JsonResponse({'message': stdout.getvalue()})
   except Exception, e:
-    stdout.seek(0)
-    LOG.error('Failed to run loaddata command in import_documents:\n %s' % stdout.read())
+    LOG.error('Failed to run loaddata command in import_documents:\n %s' % stdout.getvalue())
     return JsonResponse({'status': -1, 'message': smart_str(e)})
   finally:
     stdout.close()
 
-  Document.objects.sync()
-
-  if request.POST.get('redirect'):
-    return redirect(request.POST.get('redirect'))
-  else:
-    return JsonResponse({'message': stdout.getvalue()})
-
 
 def _is_import_valid(documents):
   """