Merge lp:~javier.collado/utah/bug1169846-test-case into lp:utah

[Javier Collado]

This branch adds the test case for the timeout functionality that was missing
in the original merge request:
https://code.launchpad.net/~javier.collado/utah/bug1169846/+merge/159821

[Andy Doan (doanac)]

pretty good. you think we can try and grep the exception for the missing steps?

[lp:~javier.collado/utah/bug1169846-test-case]

870. By Javier Collado on 2013-04-22

Do not use repr to display the message name

871. By Javier Collado on 2013-04-22

Match exception message to ensure current message and remaining messages are there

[Javier Collado (javier.collado)]

Thanks for your feedback. A pattern has been added to verify the step in the
exception message are correct.

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

=== modified file 'tests/test_rsyslog.py'
--- tests/test_rsyslog.py	2013-04-10 15:26:26 +0000
+++ tests/test_rsyslog.py	2013-04-22 11:16:26 +0000
@@ -16,6 +16,7 @@
 """Test syslog processing functionality."""
 
 
+import itertools
 import logging
 import socket
 import time
@@ -25,6 +26,7 @@
 
 from utah.exceptions import UTAHException
 from utah.provisioning.rsyslog import RSyslog
+from utah.timeout import UTAHTimeout
 
 
 class TestRsyslog(unittest.TestCase):
@@ -246,3 +248,37 @@
     def test_usefile_truncation(self):
         """Test tailing a file with truncation."""
         self.usefile(True)
+
+    def test_timeout(self):
+        """UTAHTimeout is raised on timeout"""
+        steps = [
+            {
+                "message": "message_1",
+                "pattern": "finished",
+                "timeout": 1,
+            },
+            {
+                "message": "message_2",
+                "pattern": "pattern",
+            },
+            {
+                "message": "message_3",
+                "pattern": "pattern",
+            },
+        ]
+
+        messages = itertools.repeat('log example')
+        pattern = (r'Timeout \({}\) occurred for {} message.\n'
+                   r'Remaining messages: {}'
+                   .format(steps[0]['timeout'],
+                           steps[0]['message'],
+                           ', '.join([step['message']
+                                     for step in steps[1:]])))
+
+        r = RSyslog('utah-test', '/tmp')
+        thread = threading.Thread(target=self.producer,
+                                  args=(r.port, messages))
+        thread.daemon = True
+        thread.start()
+        self.assertRaisesRegexp(UTAHTimeout, pattern,
+                                r.wait_for_install, steps)

=== modified file 'utah/provisioning/rsyslog.py'
--- utah/provisioning/rsyslog.py	2013-04-19 11:19:55 +0000
+++ utah/provisioning/rsyslog.py	2013-04-22 11:16:26 +0000
@@ -157,7 +157,7 @@
                     remaining_messages = [step['message']
                                           for step in steps[x + 1:]]
                     log_message = (
-                        'Timeout ({}) occurred for {!r} message.\n'
+                        'Timeout ({}) occurred for {} message.\n'
                         'Remaining messages: {}'
                         .format(timeout, message,
                                 ', '.join(remaining_messages)))