Sleep before pinging, instead of using -w/-c ping options.

whitequark · whitequark · commit e411116ad222 · 2016-11-24T10:46:51.000Z
These options don't work if there's a possibility that the host
will not return ARP replies as then ping will exit immediately.
diff --git a/commands/__init__.py b/commands/__init__.py
@@ -1,3 +1,4 @@
 from .lit_test import LitTestCommand
 from .coveralls import CoverallsCommand
 from .xilinx import XilinxCommand
+from .sleep import Sleep
diff --git a/commands/delay.py b/commands/delay.py
@@ -0,0 +1,18 @@
+from buildbot.process.buildstep import BuildStep
+from buildbot.status.results import SUCCESS
+
+class Sleep(BuildStep):
+    """
+    A build step that does nothing for a predefined time.
+    """
+    parms = BuildStep.parms + ['delay']
+
+    delay = None # in seconds
+
+    def start(self):
+        self.step_status.setText(["sleeping", "%g sec" % self.delay])
+        reactor.callLater(self.delay, self.finished, SUCCESS)
+
+    def finished(self, results):
+        self.step_status.setText(["sleeped", "%g sec" % self.delay])
+        buildstep.BuildStep.finished(self, results)
diff --git a/master.cfg b/master.cfg
@@ -89,7 +89,7 @@ from buildbot.steps.master import MasterShellCommand
 from buildbot.steps.transfer import DirectoryUpload
 from buildbot.steps.trigger import Trigger
 from buildbot.process.properties import renderer
-from commands import LitTestCommand, CoverallsCommand, XilinxCommand
+from commands import LitTestCommand, CoverallsCommand, XilinxCommand, Sleep
 
 conda_lock = locks.SlaveLock('conda', maxCount=1)
 
@@ -437,10 +437,15 @@ def addARTIQFlashSteps(factory, options, address):
             env               = condaEnv(use_local=True),
             locks             = default_locks))
 
+    factory.addStep(
+        Sleep(
+            delay             = 10.0,
+            locks             = default_locks))
+
     factory.addStep(
         MasterShellCommand(
             name              = 'ping',
-            command           = ['ping', address, '-c30', '-w120'],
+            command           = ['ping', address],
             description       = ['pinging', address],
             descriptionDone   = ['ping', address],
             haltOnFailure     = True,
