[MediaWiki-commits] [Gerrit] operations...pybal[master]: Fix Server testInitialize test case

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405308 )

Change subject: Fix Server testInitialize test case
......................................................................

Fix Server testInitialize test case

pybal.server.Server.initialize was being overridden with a MagicMock
in test_coordinator.py, which interfered with unit tests in
test_server.py

server.py now has 100% unit testing coverage.

Change-Id: I2e7d185557e2bc887817d220edcfc64645fe4b95
---
M pybal/test/test_coordinator.py
M pybal/test/test_server.py
2 files changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/08/405308/1

diff --git a/pybal/test/test_coordinator.py b/pybal/test/test_coordinator.py
index b6ab1a9..c0dab8d 100644
--- a/pybal/test/test_coordinator.py
+++ b/pybal/test/test_coordinator.py
@@ -31,8 +31,6 @@
         self.coordinator.lvsservice.getDepoolThreshold = mock.MagicMock(
                 return_value=0.5)
 
-        pybal.server.Server.initialize = mock.MagicMock()
-
     def tearDown(self):
         self.coordinator.configObserver.reloadTask.stop()
 
@@ -47,7 +45,8 @@
             server.up = True
             server.enabled = True
 
-    def test2serversCanDepool(self):
+    @mock.patch('pybal.server.Server.initialize')
+    def test2serversCanDepool(self, mock_initialize):
         servers = {
             'cp1045.eqiad.wmnet': {},
             'cp1046.eqiad.wmnet': {},
@@ -71,7 +70,8 @@
         # cannot depool.
         self.assertFalse(self.coordinator.canDepool())
 
-    def test4serversCanDepool(self):
+    @mock.patch('pybal.server.Server.initialize')
+    def test4serversCanDepool(self, mock_initialize):
         servers = {
             'cp1045.eqiad.wmnet': {},
             'cp1046.eqiad.wmnet': {},
diff --git a/pybal/test/test_server.py b/pybal/test/test_server.py
index 017b3fa..de33e12 100644
--- a/pybal/test/test_server.py
+++ b/pybal/test/test_server.py
@@ -102,14 +102,13 @@
         self.assertEqual(len(self.server.monitors), 0)
 
     def testInitialize(self):
-        def callback(result):
-            self.assertTrue(isinstance(result, bool))
-            self.assertEquals(self.server.ready, result)
+        def cb(result):
+             self.assertIsInstance(result, bool)
+             self.assertEquals(self.server.ready, result)
 
-        self.server.createMonitoringInstances = mock.MagicMock()
-        deferred = self.server.initialize(self.mockCoordinator)
-        deferred.addCallback(callback)
-        return deferred
+        d = self.server.initialize(self.mockCoordinator)
+        d.addCallback(cb)
+        return d
 
     @mock.patch('pybal.server.Server.createMonitoringInstances')
     def testReady(self, mock_createMonitoringInstances):

-- 
To view, visit https://gerrit.wikimedia.org/r/405308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e7d185557e2bc887817d220edcfc64645fe4b95
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits