Merge lp:~doanac/utah/mir-bug into lp:utah

[Andy Doan]

This fixes a subtle problem with our fast-forward logic in the rsyslog module

[Javier Collado (javier.collado)]

The changes look good and the test cases work.

Just for my own curiosity, I tried to check that the changes were not needed if the pattern are just strings (which are converted to arrays internally), but that didn't work. Shouldn't that have worked?

=== modified file 'tests/test_rsyslog.py'
--- tests/test_rsyslog.py 2013-07-23 22:21:19 +0000
+++ tests/test_rsyslog.py 2013-07-24 16:55:22 +0000
@@ -162,16 +162,16 @@
         steps = [
             {
                 "message": "test_future",
- "pattern": [".*"],
+ "pattern": ".*",
                 "booted": True,
             },
             {
                 "message": "hit skipped",
- "pattern": ["hit skipped"],
+ "pattern": "hit skipped",
             },
             {
                 "message": "this will hit step three",
- "pattern": [".*this will hit step three"],
+ "pattern": ".*this will hit step three",
             },
         ]

=== modified file 'utah/provisioning/rsyslog.py'
--- utah/provisioning/rsyslog.py 2013-07-23 22:21:19 +0000
+++ utah/provisioning/rsyslog.py 2013-07-24 16:53:14 +0000
@@ -216,12 +216,8 @@

                 if not isinstance(pattern, list):
                     pattern = [pattern]
- else:
- pattern = pattern[:] # create a copy so we don't alter
                 if not isinstance(fail_pattern, list):
                     fail_pattern = [fail_pattern]
- else:
- fail_pattern = fail_pattern[:]
                 pattern.extend(fail_pattern)
                 future_pats = self._future_patterns(steps, x)
                 pattern.extend(future_pats)

[Andy Doan (doanac)]

On 07/24/2013 11:59 AM, Javier Collado wrote:
> Just for my own curiosity, I tried to check that the changes were not needed if the pattern are just strings (which are converted to arrays internally), but that didn't work. Shouldn't that have worked?

hmm- that type test fails when I run it at home?

=== modified file 'tests/test_rsyslog.py'
--- tests/test_rsyslog.py	2013-06-24 21:56:46 +0000
+++ tests/test_rsyslog.py	2013-07-23 22:47:23 +0000
@@ -157,6 +157,44 @@
 
         self.assertTrue(self.test_future_booted, 'booted callback not made')
 
+    def test_future_array(self):
+        """Test handling a missing message if the pattern is an array."""
+        steps = [
+            {
+                "message": "test_future",
+                "pattern": [".*"],
+                "booted": True,
+            },
+            {
+                "message": "hit skipped",
+                "pattern": ["hit skipped"],
+            },
+            {
+                "message": "this will hit step three",
+                "pattern": [".*this will hit step three"],
+            },
+        ]
+
+        messages = [
+            'this will hit step one',
+            'this will hit step three',
+        ]
+
+        r = RSyslog("utah-test", self.logdir)
+        threading.Thread(target=self.producer, args=(r.port, messages)).start()
+
+        def booted_cb(match):
+            self.test_future_booted = True
+
+        self.test_future_booted = False
+        with patch.object(r.logger, 'warn') as mock_method:
+            r._wait_for_steps(steps, 5, self.logfile, {'booted': booted_cb})
+            mock_method.assert_called_with(
+                'Expected pattern missed, matched future pattern: %s',
+                steps[2]['pattern'][0])
+
+        self.assertTrue(self.test_future_booted, 'booted callback not made')
+
     def test_callbacks(self):
         """Make sure wait_for_steps works."""
         steps = [

=== modified file 'utah/provisioning/rsyslog.py'
--- utah/provisioning/rsyslog.py	2013-06-12 17:14:15 +0000
+++ utah/provisioning/rsyslog.py	2013-07-23 22:47:23 +0000
@@ -216,8 +216,12 @@
 
                 if not isinstance(pattern, list):
                     pattern = [pattern]
+                else:
+                    pattern = pattern[:]  # create a copy so we don't alter
                 if not isinstance(fail_pattern, list):
                     fail_pattern = [fail_pattern]
+                else:
+                    fail_pattern = fail_pattern[:]
                 pattern.extend(fail_pattern)
                 future_pats = self._future_patterns(steps, x)
                 pattern.extend(future_pats)