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

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)

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?