Backed out changeset c06258f53c2c (bug 1423666) for build bustage on OS X on a CLOSED TREE

toolkit/crashreporter/tools/symbolstore.py

@@ -524,13 +524,11 @@ class Dumper:
 
         sourceFileStream = ''
         code_id, code_file = None, None
-        cmd = self.dump_syms_cmdline(file, arch, dsymbundle=dsymbundle)
-        print(' '.join(cmd), file=sys.stderr)
-
-        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE)
-
         try:
+            cmd = self.dump_syms_cmdline(file, arch, dsymbundle=dsymbundle)
+            print(' '.join(cmd), file=sys.stderr)
+            proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                                    stderr=open(os.devnull, 'wb'))
             module_line = proc.stdout.next()
             if module_line.startswith("MODULE"):
                 # MODULE os cpu guid debug_file
@@ -587,6 +585,7 @@ class Dumper:
                         # pass through all other lines unchanged
                         f.write(line)
                 f.close()
+                proc.wait()
                 # we output relative paths so callers can get a list of what
                 # was generated
                 print(rel_path)
@@ -602,13 +601,6 @@ class Dumper:
         except Exception as e:
             print("Unexpected error: %s" % str(e), file=sys.stderr)
             raise
-        finally:
-            proc.wait()
-
-        if proc.returncode != 0:
-            # unit tests pass an iterator instead of a file so we can't use proc.stderr.read()
-            print("Unexpected error: %s" % ''.join(list(proc.stderr)), file=sys.stderr)
-            raise subprocess.CalledProcessError(proc.returncode, cmd, None)
 
         if dsymbundle:
             shutil.rmtree(dsymbundle)

toolkit/crashreporter/tools/unit-symbolstore.py

@@ -121,7 +121,6 @@ class TestCopyDebug(HelperMixin, unittest.TestCase):
             m.wait.return_value = 0
             # communicate returns the full text of stdout and stderr.
             m.communicate.return_value = ('\n'.join(stdout_), '')
-            m.returncode = 0
             return m
         self.mock_popen.side_effect = next_popen
         shutil.rmtree = patch("shutil.rmtree").start()
@@ -302,7 +301,6 @@ if target_platform() == 'WINNT':
                     "FILE 0 %s" % sourcefile,
                     "PUBLIC xyz 123"
                     ])
-            mock_Popen.return_value.returncode = 0
             mock_communicate = mock_Popen.return_value.communicate
             mock_communicate.side_effect = [("abcd1234", ""),
                                             ("http://example.com/repo", ""),
@@ -443,7 +441,6 @@ class TestFileMapping(HelperMixin, unittest.TestCase):
                 ]
             )
         mock_Popen.return_value.stdout = mk_output(dumped_files)
-        mock_Popen.return_value.returncode = 0
 
         d = symbolstore.Dumper('dump_syms', self.symboldir,
                                file_mapping=file_mapping)
@@ -455,31 +452,6 @@ class TestFileMapping(HelperMixin, unittest.TestCase):
                                    file_id[1], file_id[0], file_id[1] + '.sym')
         self.assertEqual(open(symbol_file, 'r').read(), expected_output)
 
-class TestReturnCode(HelperMixin, unittest.TestCase):
-    def setUp(self):
-        HelperMixin.setUp(self)
-        self.objdir = os.path.join(self.test_dir, 'obj')
-        os.mkdir(self.objdir)
-        self.symboldir = os.path.join(self.test_dir, 'symbols')
-        os.mkdir(self.symboldir)
-
-    @patch("subprocess.Popen")
-    def testReturnCode(self, mock_Popen):
-        # mock the dump_syms output
-        dump_syms_output = iter([''])
-        dump_syms_err = iter(['error'])
-        mock_Popen.return_value.returncode = 1
-        mock_Popen.return_value.stdout = dump_syms_output
-        mock_Popen.return_value.stderr = dump_syms_err
-
-        d = symbolstore.Dumper('dump_syms', self.symboldir)
-        f = os.path.join(self.objdir, 'somefile')
-
-        with self.assertRaises(subprocess.CalledProcessError) as e:
-            d.Process(f)
-            self.assertEqual(e.returncode, 1)
-            self.assertEqual(e.stderr, dump_syms_err)
-
 class TestFunctional(HelperMixin, unittest.TestCase):
     '''Functional tests of symbolstore.py, calling it with a real
     dump_syms binary and passing in a real binary to dump symbols from.