Merge lp:~nuclearbob/utah/reset-rc into lp:utah

[Max Brustkern]

Added --reset-rc option to client

This branch adds a --reset-rc option to the utah client. This option is written to rc.local when utah uses rc.local for reboots. In absence of this option, a reset of rc.local will no longer be automatically triggered. This should allow provisioned autorun to work with reboot test cases.

[lp:~nuclearbob/utah/reset-rc]

1034. By Max Brustkern on 2014-02-26

Added test

1035. By Max Brustkern on 2014-02-26

Fixed flake8

[Andy Doan (doanac)]

I'm basically a +1. I was curious if you thought we could do this with out needing the new option and just auto-detecting how we were launched using logic like we have here:

 http://bazaar.launchpad.net/~nuclearbob/utah/reset-rc/view/head:/utah/client/runner.py#L592

I don't want to cause you a lot of effort doing more testing, but I'll give you bonus points if we could do it like that instead.

[Max Brustkern (nuclearbob)]

Doing that would be better, yeah. I'll look at it today and see if I can figure something out.

[lp:~nuclearbob/utah/reset-rc]

1036. By Max Brustkern on 2014-02-26

Converting _autorun_file to _launched_by

1037. By Max Brustkern on 2014-02-26

pep257 fix

[Max Brustkern (nuclearbob)]

Testing a new version now:
http://q-jenkins:8080/job/bootspeed-trusty-desktop-amd64-acer-veriton-03/13/

[Max Brustkern (nuclearbob)]

We've completed several successful runs, so I'm happy with the testing of the new version. If you'd like to take a look at it again, we can verify it's good to go.

review: Needs Resubmitting

[Andy Doan (doanac)]

thanks max. this looks like it will be a lot easier to maintain.

review: Approve

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2014-02-25 19:59:16 +0000
+++ utah/client/runner.py	2014-02-26 17:55:31 +0000
@@ -194,11 +194,14 @@
 
         self.state_agent = state_agent or StateAgentYAML()
 
+        # Only reset RC_LOCAL if we were invoked there
+        if self._launched_by() == 'rc.local':
+            self.reset_rc_local()
+
         # Cleanup the state file if this is supposed to be a fresh run.
         if not resume:
             self.state_agent.clean()
         else:
-            self.reset_rc_local()
             self.load_state()
 
         chdir(self.testsuitedir)
@@ -551,13 +554,15 @@
         """
         return self.get_next_suite().get_next_test()
 
-    def _autorun_file(self):
-        """Determine if this was launched via the autorun feature.
+    def _launched_by(self):
+        """Determine how this was launched (autorun, rc.local, neither).
 
-        :return: the autorun file or None
+        :return: 'rc.local', the autorun file, or None
 
         """
         r = os.listdir('/var/cache/utah/autorun/inprogress')
+        if '/usr/bin/utah --resume' in open(RC_LOCAL):
+            return 'rc.local'
         if len(r) == 1 and 'run-utah' in r[0]:
             return r[0]
         return None
@@ -585,11 +590,10 @@
 
         self.save_state()
 
-        f = self._autorun_file()
-        if f:
+        f = self._launched_by()
+        if f and f != 'rc.local':
             logger.log('restarting client via autostart on reboot')
             self.setup_rc_local(runlist=self.backup_runlist, rc_local=f)
-            logger.log('Renaming %s to /etc/utah/autorun/01_run-utah', f)
             os.rename(f, '/etc/utah/autorun/01_run-utah')
         else:
             logger.log('restarting client via rc.local on reboot')

=== modified file 'utah/client/tests/test_runner.py'
--- utah/client/tests/test_runner.py	2013-06-11 17:12:07 +0000
+++ utah/client/tests/test_runner.py	2014-02-26 17:55:31 +0000
@@ -244,6 +244,24 @@
                 f.write('andy: blah\n')
             Runner._fetch_and_parse(self.tmpfile)
 
+    def test_reset_rc(self):
+        """Test reset_rc_local is only called when the argument is True."""
+        with patch('utah.client.runner.Runner.reset_rc_local') as reset:
+            Runner(install_type='desktop',
+                   result=ResultYAML(filename=None,
+                                     append_to_file=False),
+                   state_agent=self.state_agent,
+                   output=self.output_file,
+                   reset_rc=False)
+            assert not reset.called
+            Runner(install_type='desktop',
+                   result=ResultYAML(filename=None,
+                                     append_to_file=False),
+                   state_agent=self.state_agent,
+                   output=self.output_file,
+                   reset_rc=True)
+            assert reset.called
+
 
 class TestRunnerMasterRunlistSchema(unittest.TestCase):