Bug 826769 - make mochitest-robotium may fail with: OSError: [Errno 2] No such file or directory: '/tmp/xxx/tests.jar'. r=gbrown
authorJoel Maher <jmaher@mozilla.com>
Fri, 04 Jan 2013 13:42:32 -0500
changeset 117658 3a2d5a7a446fdb8df3a3f2831c9419fef9bdf35d
parent 117657 ed8df7cc59ab460b7f200e16ab746760c0099c49
child 117659 6e251f2906f5a280e40d9098330e39ea246a8ed7
push id24110
push userphilringnalda@gmail.com
push dateSat, 05 Jan 2013 23:57:49 +0000
treeherdermozilla-central@20d1a5916ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs826769
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 826769 - make mochitest-robotium may fail with: OSError: [Errno 2] No such file or directory: '/tmp/xxx/tests.jar'. r=gbrown
testing/mochitest/runtestsremote.py
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -300,19 +300,21 @@ class MochiRemote(Mochitest):
 
         # we do not need this for robotium based tests, lets save a LOT of time
         if options.robocop:
             shutil.rmtree(os.path.join(options.profilePath, 'webapps'))
             shutil.rmtree(os.path.join(options.profilePath, 'extensions', 'staged', 'mochikit@mozilla.org'))
             shutil.rmtree(os.path.join(options.profilePath, 'extensions', 'staged', 'worker-test@mozilla.org'))
             shutil.rmtree(os.path.join(options.profilePath, 'extensions', 'staged', 'workerbootstrap-test@mozilla.org'))
             shutil.rmtree(os.path.join(options.profilePath, 'extensions', 'staged', 'special-powers@mozilla.org'))
-            os.remove(os.path.join(options.profilePath, 'tests.jar'))
             os.remove(os.path.join(options.profilePath, 'userChrome.css'))
-            os.remove(os.path.join(options.profilePath, 'tests.manifest'))
+            if os.path.exists(os.path.join(options.profilePath, 'tests.jar')):
+                os.remove(os.path.join(options.profilePath, 'tests.jar'))
+            if os.path.exists(os.path.join(options.profilePath, 'tests.manifest')):
+                os.remove(os.path.join(options.profilePath, 'tests.manifest'))
 
         try:
             self._dm.pushDir(options.profilePath, self.remoteProfile)
         except devicemanager.DMError:
             print "Automation Error: Unable to copy profile to device."
             raise
 
         options.profilePath = self.remoteProfile