Combine sampler tests into single file. (#147)

* Combine sampler tests into single file.

* Pin external_botocore dependency on rsa for py27.

* Pin external_boto3 dependency on rsa for py27.

Author: TimPansino

tests/agent_unittests/test_cpu_sampler.py

@@ -21,30 +21,46 @@
 
 from newrelic.core.config import global_settings
 from newrelic.packages import six
+from newrelic.samplers.cpu_usage import cpu_usage_data_source
 from newrelic.samplers.gc_data import garbage_collector_data_source
+from newrelic.samplers.memory_usage import memory_usage_data_source
 
 settings = global_settings()
 
 
 @pytest.fixture
-def data_source():
+def gc_data_source():
     sampler = garbage_collector_data_source(settings=())["factory"](environ=())
     sampler.start()
     yield sampler
     sampler.stop()
 
 
+@pytest.fixture
+def cpu_data_source():
+    sampler = cpu_usage_data_source(settings=())["factory"](environ=())
+    sampler.start()
+    yield sampler
+    sampler.stop()
+
+
+@pytest.fixture
+def memory_data_source():
+    sampler = memory_usage_data_source(settings=())["factory"](environ=())
+    yield sampler
+
+
 PID = os.getpid()
 
 if six.PY2:
-    EXPECTED_METRICS = (
+    EXPECTED_GC_METRICS = (
         "GC/objects/%d/all" % PID,
         "GC/objects/%d/generation/0" % PID,
         "GC/objects/%d/generation/1" % PID,
         "GC/objects/%d/generation/2" % PID,
     )
 else:
-    EXPECTED_METRICS = (
+    EXPECTED_GC_METRICS = (
         "GC/objects/%d/all" % PID,
         "GC/objects/%d/generation/0" % PID,
         "GC/objects/%d/generation/1" % PID,
@@ -75,7 +91,7 @@ def data_source():
     raises=AssertionError,
 )
 @pytest.mark.parametrize("top_object_count_limit", (1, 0))
-def test_gc_metrics_collection(data_source, top_object_count_limit):
+def test_gc_metrics_collection(gc_data_source, top_object_count_limit):
     @override_generic_settings(
         settings,
         {
@@ -85,9 +101,9 @@ def test_gc_metrics_collection(data_source, top_object_count_limit):
     )
     def _test():
         gc.collect()
-        metrics_table = set(m[0] for m in (data_source() or ()))
+        metrics_table = set(m[0] for m in (gc_data_source() or ()))
 
-        for metric in EXPECTED_METRICS:
+        for metric in EXPECTED_GC_METRICS:
             assert metric in metrics_table
 
         # Verify object count by type metrics are recorded
@@ -109,9 +125,39 @@ def _test():
     reason="GC Metrics are always disabled on PyPy",
 )
 @pytest.mark.parametrize("enabled", (True, False))
-def test_gc_metrics_config(data_source, enabled):
+def test_gc_metrics_config(gc_data_source, enabled):
     @override_generic_settings(settings, {"gc_profiler.enabled": enabled})
     def _test():
-        assert data_source.enabled == enabled
+        assert gc_data_source.enabled == enabled
 
     _test()
+
+
+EXPECTED_CPU_METRICS = (
+    "CPU/User Time",
+    "CPU/User/Utilization",
+    "CPU/System Time",
+    "CPU/System/Utilization",
+    "CPU/Total Time",
+    "CPU/Total/Utilization",
+)
+
+
+def test_cpu_metrics_collection(cpu_data_source):
+    metrics_table = set(m[0] for m in (cpu_data_source() or ()))
+
+    for metric in EXPECTED_CPU_METRICS:
+        assert metric in metrics_table
+
+
+EXPECTED_MEMORY_METRICS = (
+    "Memory/Physical/%d" % PID,
+    "Memory/Physical/Utilization/%d" % PID,
+)
+
+
+def test_memory_metrics_collection(memory_data_source):
+    metrics_table = set(m[0] for m in (memory_data_source() or ()))
+
+    for metric in EXPECTED_MEMORY_METRICS:
+        assert metric in metrics_table

tests/agent_unittests/test_memory_metrics.py

@@ -189,8 +189,10 @@ deps =
     datastore_umemcache: umemcache<1.7
     external_boto3-boto01: boto3<2.0
     external_boto3-boto01: moto
+    external_boto3-py27: rsa<4.7.1
     external_botocore: botocore
     external_botocore: moto[awslambda,ec2,iam]
+    external_botocore-py27: rsa<4.7.1
     external_feedparser-feedparser05: feedparser<6
     external_feedparser-feedparser06: feedparser<7
     external_httplib2: httplib2<1.0