Merge lp:~chris.gagnon/autopilot/lp1182755 into lp:autopilot

[Chris Gagnon]

don't delete the /tmp/autopilot folder during functional tests if it already exists lp:1182755

don't delete the /tmp/autopilot directory if it already exists

[lp:~chris.gagnon/autopilot/lp1182755]

221. By Chris Gagnon on 2013-05-24

remove duplicate should_delete

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/autopilot-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/28

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/100/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'autopilot/tests/functional/test_autopilot_functional.py'
--- autopilot/tests/functional/test_autopilot_functional.py	2013-05-22 20:43:20 +0000
+++ autopilot/tests/functional/test_autopilot_functional.py	2013-05-24 00:02:26 +0000
@@ -425,12 +425,14 @@
             """
             ))
 
-        self.addCleanup(remove_if_exists, "/tmp/autopilot")
+        should_delete = not os.path.exists('/tmp/autopilot')
         code, output, error = self.run_autopilot(["run", "-r", "tests"])
 
         self.assertThat(code, Equals(1))
         self.assertTrue(os.path.exists('/tmp/autopilot'))
         self.assertTrue(os.path.exists('/tmp/autopilot/tests.test_simple.SimpleTest.test_simple.ogv'))
+        if should_delete:
+            self.addCleanup(remove_if_exists, "/tmp/autopilot") 
 
     def test_record_dir_option_works(self):
         """Must be able to specify record directory flag."""