[CalendarServer-changes] [15282] CalendarServer/branches/users/cdaboo/update-packages/calendarserver /tap

[source_changes at macosforge.org]

Revision: 15282
          http://trac.calendarserver.org//changeset/15282
Author:   cdaboo at apple.com
Date:     2015-11-04 07:12:27 -0800 (Wed, 04 Nov 2015)
Log Message:
-----------
psutil API change.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/test/test_util.py
    CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/util.py

Modified: CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/test/test_util.py
===================================================================
--- CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/test/test_util.py	2015-11-04 14:53:14 UTC (rev 15281)
+++ CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/test/test_util.py	2015-11-04 15:12:27 UTC (rev 15282)
@@ -14,17 +14,19 @@
 # limitations under the License.
 ##
 
-from calendarserver.tap.util import (
-    MemoryLimitService, Stepper, verifyTLSCertificate
-)
-from twistedcaldav.util import computeProcessCount
-from twistedcaldav.test.util import TestCase
+from calendarserver.tap.util import MemoryLimitService, Stepper, verifyTLSCertificate, memoryForPID
+
+from twisted.internet.defer import succeed, inlineCallbacks
 from twisted.internet.task import Clock
-from twisted.internet.defer import succeed, inlineCallbacks
 from twisted.python.filepath import FilePath
+
 from twistedcaldav.config import ConfigDict
+from twistedcaldav.test.util import TestCase
+from twistedcaldav.util import computeProcessCount
 
+import os
 
+
 class ProcessCountTestCase(TestCase):
 
     def test_count(self):
@@ -132,7 +134,16 @@
         self.assertEquals(processMonitor.history, ['process #1', 'process #2', 'process #3'])
 
 
+    def test_memoryForPID(self):
+        """
+        Test that L{memoryForPID} returns a valid result.
+        """
 
+        memory = memoryForPID(os.getpid())
+        self.assertNotEqual(memory, 0)
+
+
+
 #
 # Tests for Stepper
 #

Modified: CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/util.py
===================================================================
--- CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/util.py	2015-11-04 14:53:14 UTC (rev 15281)
+++ CalendarServer/branches/users/cdaboo/update-packages/calendarserver/tap/util.py	2015-11-04 15:12:27 UTC (rev 15282)
@@ -937,7 +937,7 @@
     @return: Memory used by process in bytes
     @rtype: C{int}
     """
-    memoryInfo = psutil.Process(pid).get_memory_info()
+    memoryInfo = psutil.Process(pid).memory_info()
     return memoryInfo.rss if residentOnly else memoryInfo.vms
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151104/0ca9ece6/attachment.html>