[zorg] r174135 - LitTestCommand: If the test command fails, always report failure.

[Daniel Dunbar]

Author: ddunbar
Date: Thu Jan 31 19:39:42 2013
New Revision: 174135

URL: http://llvm.org/viewvc/llvm-project?rev=174135&view=rev
Log:
LitTestCommand: If the test command fails, always report failure.

Modified:
    zorg/trunk/zorg/buildbot/commands/LitTestCommand.py

Modified: zorg/trunk/zorg/buildbot/commands/LitTestCommand.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/LitTestCommand.py?rev=174135&r1=174134&r2=174135&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/LitTestCommand.py (original)
+++ zorg/trunk/zorg/buildbot/commands/LitTestCommand.py Thu Jan 31 19:39:42 2013
@@ -76,8 +76,14 @@ class LitTestCommand(Test):
     self.addLogObserver('stdio', self.logObserver)
 
   def evaluateCommand(self, cmd):
+    # Always report failure if the command itself failed.
+    if cmd.rc != 0:
+      return FAILURE
+
+    # Otherwise, report failure if there were failures in the log.
     if self.logObserver.failed:
-        return FAILURE
+      return FAILURE
+
     return SUCCESS
 
   def describe(self, done=False):
@@ -97,6 +103,10 @@ class StepProxy(object):
   def addCompleteLog(self, name, text):
     self.logs.append((name, text))
 
+class RemoteCommandProxy(object):
+  def __init__(self, rc):
+    self.rc = rc
+
 class TestLogObserver(unittest.TestCase):
   def parse_log(self, text):
     observer = LitLogObserver()
@@ -115,5 +125,18 @@ PASS: test-three (3 of 3)
     self.assertEqual(obs.resultCounts, { 'FAIL' : 1, 'PASS' : 2 })
     self.assertEqual(obs.step.logs, [('test-two', 'FAIL: test-two (2 of 3)')])
 
+class TestCommand(unittest.TestCase):
+  def parse_log(self, text):
+    cmd = LitTestCommand()
+    cmd.logObserver.step = StepProxy()
+    for ln in text.split('\n'):
+      cmd.logObserver.outLineReceived(ln)
+    return cmd
+
+  def test_command_status(self):
+    # If the command failed, the status should always be error.
+    cmd = self.parse_log("")
+    self.assertEqual(cmd.evaluateCommand(RemoteCommandProxy(1)), FAILURE)
+
 if __name__ == '__main__':
   unittest.main()