From 65481b5df7144843c1a33ca00d5ced5c7b2ac48f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 15 Dec 2016 13:25:20 +0000
Subject: [PATCH] Moved warnings settings from manage.py and test_runner.py to
 one single place, settings.py.  Decreased the verbosity level when invoking
 'loaddata' from the test runner.  - Legacy-Id: 12535

---
 ietf/manage.py            | 3 ---
 ietf/settings.py          | 6 ++++++
 ietf/utils/test_runner.py | 5 +----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ietf/manage.py b/ietf/manage.py
index 695b686c3..92f237fe8 100755
--- a/ietf/manage.py
+++ b/ietf/manage.py
@@ -1,8 +1,5 @@
 #!/usr/bin/env python
 
-import warnings
-warnings.filterwarnings("ignore",category=DeprecationWarning)
-
 import os
 import sys
 
diff --git a/ietf/settings.py b/ietf/settings.py
index 7315fe06e..da42ac7ca 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -7,6 +7,12 @@
 import os
 import sys
 import datetime
+import warnings
+
+warnings.simplefilter("always", DeprecationWarning)
+warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report")
+warnings.filterwarnings("ignore", message="initial_data fixtures are deprecated. Use data migrations instead.", module="django.core.management.commands.loaddata")
+warnings.filterwarnings("ignore", message="The popen2 module is deprecated.  Use the subprocess module.", module="ietf.utils.pipe")
 
 try:
     import syslog
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index e899cdcf3..259bd10bc 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -41,7 +41,6 @@ import json
 import pytz
 import importlib
 import socket
-import warnings
 import datetime
 import codecs
 import gzip
@@ -87,7 +86,7 @@ def safe_create_1(self, verbosity, *args, **kwargs):
     if settings.GLOBAL_TEST_FIXTURES:
         print "     Loading global test fixtures: %s" % ", ".join(settings.GLOBAL_TEST_FIXTURES)
         loadable = [f for f in settings.GLOBAL_TEST_FIXTURES if "." not in f]
-        call_command('loaddata', *loadable, verbosity=verbosity, commit=False, database="default")
+        call_command('loaddata', *loadable, verbosity=int(verbosity)-1, commit=False, database="default")
 
         for f in settings.GLOBAL_TEST_FIXTURES:
             if f not in loadable:
@@ -96,8 +95,6 @@ def safe_create_1(self, verbosity, *args, **kwargs):
                 module = importlib.import_module(".".join(components[:-1]))
                 fn = getattr(module, components[-1])
                 fn()
-    if verbosity < 2:
-        warnings.simplefilter("ignore", DeprecationWarning)
 
     return test_database_name