Test Suite Updates & Cleanup (#240)

* Remove deprecated assert_equals

* Use logger.warning instead of logger.warn

* Use self.assertEqual

* Skip unstable tests

* Update test methods

* Skip unstable tests

Author: pglombardo

instana/agent/test.py

@@ -27,6 +27,6 @@ def can_send(self):
         return True
 
     def report_traces(self, spans):
-        logger.warn("Tried to report_traces with a TestAgent!")
+        logger.warning("Tried to report_traces with a TestAgent!")
 
 

instana/collector.py

@@ -31,7 +31,7 @@ def start(self):
             t.setDaemon(True)
             t.start()
         else:
-            logger.warn("Collector started but the agent tells us we can't send anything out.")
+            logger.warning("Collector started but the agent tells us we can't send anything out.")
 
     def shutdown(self):
         logger.debug("Collector.shutdown: Reporting final data.")

instana/hooks/hook_uwsgi.py

@@ -16,7 +16,7 @@
     opt_lazy_apps = uwsgi.opt.get('lazy-apps', False)
 
     if uwsgi.opt.get('enable-threads', False) is False and uwsgi.opt.get('gevent', False) is False:
-        logger.warn("Required: Neither uWSGI threads or gevent is enabled. " +
+        logger.warning("Required: Neither uWSGI threads or gevent is enabled. " +
                     "Please enable by using the uWSGI --enable-threads or --gevent option.")
 
     if opt_master and opt_lazy_apps is False:

instana/instrumentation/django/middleware.py

@@ -90,7 +90,7 @@ def load_middleware_wrapper(wrapped, instance, args, kwargs):
             elif type(settings.MIDDLEWARE) is list:
                 settings.MIDDLEWARE = [DJ_INSTANA_MIDDLEWARE] + settings.MIDDLEWARE
             else:
-                logger.warn("Instana: Couldn't add InstanaMiddleware to Django")
+                logger.warning("Instana: Couldn't add InstanaMiddleware to Django")
 
         elif hasattr(settings, 'MIDDLEWARE_CLASSES') and settings.MIDDLEWARE_CLASSES is not None:
             if DJ_INSTANA_MIDDLEWARE in settings.MIDDLEWARE_CLASSES:
@@ -104,14 +104,14 @@ def load_middleware_wrapper(wrapped, instance, args, kwargs):
             elif type(settings.MIDDLEWARE_CLASSES) is list:
                 settings.MIDDLEWARE_CLASSES = [DJ_INSTANA_MIDDLEWARE] + settings.MIDDLEWARE_CLASSES
             else:
-                logger.warn("Instana: Couldn't add InstanaMiddleware to Django")
+                logger.warning("Instana: Couldn't add InstanaMiddleware to Django")
 
         else:
-            logger.warn("Instana: Couldn't find middleware settings")
+            logger.warning("Instana: Couldn't find middleware settings")
 
         return wrapped(*args, **kwargs)
     except Exception:
-        logger.warn("Instana: Couldn't add InstanaMiddleware to Django: ", exc_info=True)
+        logger.warning("Instana: Couldn't add InstanaMiddleware to Django: ", exc_info=True)
 
 
 try:

instana/meter.py

@@ -177,7 +177,7 @@ def metric_work():
             self.process()
 
             if self.agent.is_timed_out():
-                logger.warn("Instana host agent unreachable for >1 min.  Going to sit in a corner...")
+                logger.warning("Instana host agent unreachable for >1 min.  Going to sit in a corner...")
                 self.agent.reset()
                 return False
             return True

instana/util.py

@@ -255,7 +255,7 @@ def get_default_gateway():
             return "%i.%i.%i.%i" % (int(hip[6:8], 16), int(hip[4:6], 16), int(hip[2:4], 16), int(hip[0:2], 16))
 
     except Exception:
-        logger.warn("get_default_gateway: ", exc_info=True)
+        logger.warning("get_default_gateway: ", exc_info=True)
 
 
 def get_py_source(file):