Merge lp:~bigkevmcd/offspring/master-dont-scan-slaves into lp:offspring

[Kevin McDermott]

This changes the behaviour of the master to not include builders marked as not active, which cuts down on logged errors.

Unmerged revisions

155. By Kevin McDermott on 2013-01-03

Implement fix for this.

154. By Kevin McDermott on 2013-01-03

Failing test for filtering slaves.

=== modified file 'lib/offspring/master/master.py'
--- lib/offspring/master/master.py	2012-08-21 13:38:17 +0000
+++ lib/offspring/master/master.py	2013-01-03 14:02:23 +0000
@@ -77,14 +77,14 @@
     def stop(self):
         self.is_online = False
 
-    def _get_builders(self):
-        return self.db_store.find(Lexbuilder)
+    def get_builders(self):
+        return self.db_store.find(Lexbuilder, Lexbuilder.is_active==True)
 
     def scanSlaves(self):
         """
         Scan the currently known build slaves.
         """
-        for builder in self._get_builders():
+        for builder in self.get_builders():
             try:
                 old_state, new_state = builder.scan()
             except SlaveCommunicationError, issue:

=== modified file 'lib/offspring/master/tests/test_master.py'
--- lib/offspring/master/tests/test_master.py	2012-08-21 13:38:17 +0000
+++ lib/offspring/master/tests/test_master.py	2013-01-03 14:02:23 +0000
@@ -28,7 +28,8 @@
         return LexbuilderMaster(self.config, self.db_store,
                                 mailer=self.mailer.mail)
 
-    def create_builder(self, current_state=Slave.STATE_IDLE, arch=None):
+    def create_builder(
+            self, current_state=Slave.STATE_IDLE, arch=None, is_active=True):
         """
         Create and add a Lexbuilder to the store.
         """
@@ -36,7 +37,7 @@
         builder.name = u"test-builder"
         builder.previous_state = Slave.STATE_IDLE
         builder.current_state = current_state
-        builder.is_active = True
+        builder.is_active = is_active
         builder.is_okay = True
         builder.machine_type = arch or self.project.arch
         self.db_store.add(builder)
@@ -104,7 +105,7 @@
         fake_builder = FakeBuilder(Slave.STATE_IDLE, None)
         master = self.get_master()
         mock_builder = self.mocker.patch(master)
-        mock_builder._get_builders()
+        mock_builder.get_builders()
         self.mocker.result([fake_builder])
         self.mocker.replay()
 
@@ -216,6 +217,17 @@
             "Scan cycle completed\n" % {"builder": builder.name},
             log_file.getvalue())
 
+    def test_get_builders(self):
+        """
+        LexbuilderMaster.get_builders should return active Lexbuilders.
+        """
+        builder1 = self.create_builder()
+        builder2 = self.create_builder(is_active=False)
+
+        master = self.get_master()
+        result = master.get_builders()
+        self.assertEqual([builder1], list(result))
+
     def test_dispatch_builds(self):
         """
         dispatchBuilds sends BuildRequests to a slave.