Browse Source

[desktop] Fix tests

Erick Tryzelaar 10 years ago
parent
commit
5a71e7c
2 changed files with 19 additions and 24 deletions
  1. 18 23
      desktop/core/src/desktop/middleware_test.py
  2. 1 1
      desktop/core/src/desktop/views.py

+ 18 - 23
desktop/core/src/desktop/middleware_test.py

@@ -76,31 +76,26 @@ def test_audit_logging_middleware_enable():
   c = make_logged_in_client(username='test_audit_logging_middleware_enable', is_superuser=False)
 
   # Make sure we enable it with a file path
-  log_tmp = tempfile.NamedTemporaryFile("w+t") # Get a tempfile path
-  log_path = log_tmp.name
-  log_tmp.close()
-  reset = AUDIT_EVENT_LOG_DIR.set_for_testing(log_path)
-  settings.MIDDLEWARE_CLASSES.append('desktop.middleware.AuditLoggingMiddleware') # Re-add middleware
+  with tempfile.NamedTemporaryFile("w+t") as log_tmp:
+    log_path = log_tmp.name
+    reset = AUDIT_EVENT_LOG_DIR.set_for_testing(log_path)
+    settings.MIDDLEWARE_CLASSES.append('desktop.middleware.AuditLoggingMiddleware') # Re-add middleware
 
-  try:
-    # Check if we audit correctly
-    response = c.get("/beeswax/")
-    assert_true('audited' in response, response)
-
-    audit = open(log_path).readlines()
-    for line in audit:
-      audit_json = json.loads(line)
-      audit_record = audit_json.values()[0]
-      assert_equal('test_audit_logging_middleware_enable', audit_record['user'], audit_record)
-      assert_equal('/beeswax/', audit_record['url'], audit_record)
-
-  finally:
-    settings.MIDDLEWARE_CLASSES.pop()
-    reset()
     try:
-      os.remove(log_tmp)
-    except OSError:
-      pass
+      # Check if we audit correctly
+      response = c.get("/beeswax/")
+      assert_true('audited' in response, response)
+
+      audit = open(log_path).readlines()
+      for line in audit:
+        audit_json = json.loads(line)
+        audit_record = audit_json.values()[0]
+        assert_equal('test_audit_logging_middleware_enable', audit_record['user'], audit_record)
+        assert_equal('/beeswax/', audit_record['url'], audit_record)
+
+    finally:
+      settings.MIDDLEWARE_CLASSES.pop()
+      reset()
 
 def test_audit_logging_middleware_disable():
   c = make_logged_in_client(username='test_audit_logging_middleware_disable', is_superuser=False)

+ 1 - 1
desktop/core/src/desktop/views.py

@@ -126,7 +126,7 @@ def download_log_view(request):
         response['Content-Length'] = length
         return response
       except Exception, e:
-        LOG.exception("Couldn't construct zip file to write logs to: %s") % e
+        LOG.exception("Couldn't construct zip file to write logs")
         return log_view(request)
 
   return render_to_response("logs.mako", dict(log=[_("No logs found.")]))