rename included 'memory' to 'resource'

thraxil · May 5, 2016 · 93beac1 · 93beac1
1 parent 11befc1
commit 93beac1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/expvar/vars.py b/expvar/vars.py
@@ -12,7 +12,7 @@ def value(self):
 
 
 class MemoryExpVar(ExpVar):
-    name = "memory"
+    name = "resource"
 
     def value(self):
         memstats = resource.getrusage(resource.RUSAGE_SELF)

diff --git a/testapp/main/tests.py b/testapp/main/tests.py
@@ -39,12 +39,12 @@ def test_cmdline(self):
         self.assertIn('cmdline', d)
 
 
-class MemoryTest(TestCase):
-    def test_memory(self):
+class ResourceTest(TestCase):
+    def test_resource(self):
         r = self.client.get(reverse('expvar'))
         d = json.loads(smart_str(r.content))
-        self.assertIn('memory', d)
-        m = d['memory']
+        self.assertIn('resource', d)
+        m = d['resource']
         for f in MEM_FIELDS:
             self.assertIn(f, m)
 
@@ -59,11 +59,11 @@ def test_main_expvar(self):
 
 
 class ExtendTest(TestCase):
-    def test_memory(self):
+    def test_resource(self):
         r = self.client.get(reverse('expvar'))
         d = json.loads(smart_str(r.content))
-        self.assertIn('memory', d)
-        m = d['memory']
+        self.assertIn('resource', d)
+        m = d['resource']
         self.assertIn('New', m)
         self.assertEqual(m['New'], 78)
 

diff --git a/testapp/main/vars.py b/testapp/main/vars.py
@@ -13,7 +13,7 @@ class PlainExpVar(expvar.ExpVar):
 
 
 class ExtendMemory(expvar.ExpVar):
-    name = "memory"
+    name = "resource"
 
     def value(self):
         return {"New": 78}