apport-hackers team mailing list archive

[Evan Dandrea <evan.dandrea@xxxxxxxxxxxxx>]

Evan Dandrea has proposed merging lp:~ev/apport/whoopsie into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)

For more details, see:
https://code.launchpad.net/~ev/apport/whoopsie/+merge/96416
-- 
https://code.launchpad.net/~ev/apport/whoopsie/+merge/96416
Your team Apport upstream developers is requested to review the proposed merge of lp:~ev/apport/whoopsie into lp:apport.

=== modified file 'gtk/apport-gtk'
--- gtk/apport-gtk	2012-03-07 13:12:34 +0000
+++ gtk/apport-gtk	2012-03-07 17:56:20 +0000
@@ -236,6 +236,7 @@
                                                       Gtk.IconSize.DIALOG)
 
         d = self.w('dialog_crash_new')
+        d.set_title(self.report['DistroRelease'].split()[0])
         d.set_resizable(False)
         d.show()
         # don't steal focus when being called without arguments (i. e.

=== modified file 'kde/apport-kde'
--- kde/apport-kde	2012-03-02 12:04:25 +0000
+++ kde/apport-kde	2012-03-07 17:56:20 +0000
@@ -110,7 +110,10 @@
     '''Report dialog wrapper'''
 
     def __init__(self, report, allowed_to_report, ui, desktop_file):
-        Dialog.__init__(self, 'bugreport.ui', '', '', '')
+        if 'DistroRelease' not in report:
+            report.add_os_info()
+        distro = report['DistroRelease']
+        Dialog.__init__(self, 'bugreport.ui', distro.split()[0], '', '')
         self.details = self.findChild(QPushButton, 'show_details')
         self.details.clicked.connect(self.on_show_details_clicked)
         self.continue_button = self.findChild(QPushButton, 'continue_button')
@@ -129,9 +132,6 @@
         self.ui = ui
         self.collect_called = False
         icon = None
-        if 'DistroRelease' not in report:
-            report.add_os_info()
-        distro = report['DistroRelease']
         report_type = report.get('ProblemType')
 
         self.spinner = QLabel('', parent=self.treeview)

=== modified file 'test/test_ui_gtk.py'
--- test/test_ui_gtk.py	2012-03-07 13:12:34 +0000
+++ test/test_ui_gtk.py	2012-03-07 17:56:20 +0000
@@ -86,6 +86,8 @@
         self.app.report['ProblemType'] = 'KernelCrash'
         GLib.idle_add(Gtk.main_quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.w('dialog_crash_new').get_title(),
+            self.distro.split()[0])
         self.assertEqual(self.app.w('title_label').get_text(),
             _('Sorry, %s has experienced an internal error.') % self.distro)
         send_error_report = self.app.w('send_error_report')
@@ -113,6 +115,8 @@
         self.app.report['Package'] = 'apport 1.2.3~0ubuntu1'
         GLib.idle_add(Gtk.main_quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.w('dialog_crash_new').get_title(),
+            self.distro.split()[0])
         self.assertEqual(self.app.w('title_label').get_text(),
             _('Sorry, a problem occurred while installing software.'))
         send_error_report = self.app.w('send_error_report')
@@ -148,6 +152,8 @@
             self.app.report['DesktopFile'] = fp.name
             GLib.idle_add(Gtk.main_quit)
             self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.w('dialog_crash_new').get_title(),
+            self.distro.split()[0])
         self.assertEqual(self.app.w('title_label').get_text(),
             _('The application Apport has closed unexpectedly.'))
         send_error_report = self.app.w('send_error_report')
@@ -176,6 +182,8 @@
         self.app.report['Package'] = 'bash 5'
         GLib.idle_add(Gtk.main_quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.w('dialog_crash_new').get_title(),
+            self.distro.split()[0])
         self.assertEqual(self.app.w('title_label').get_text(),
             _('Sorry, %s has experienced an internal error.') % self.distro)
         self.assertEqual(self.app.w('subtitle_label').get_text(),
@@ -212,6 +220,8 @@
         self.app.cur_package = 'apport'
         GLib.idle_add(Gtk.main_quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.w('dialog_crash_new').get_title(),
+            self.distro.split()[0])
         self.assertEqual(self.app.w('title_label').get_text(),
             _('Sorry, the application apport has closed unexpectedly.'))
         self.assertEqual(self.app.w('subtitle_label').get_text(),

=== modified file 'test/test_ui_kde.py'
--- test/test_ui_kde.py	2012-03-06 07:25:07 +0000
+++ test/test_ui_kde.py	2012-03-07 17:56:20 +0000
@@ -90,6 +90,8 @@
         self.app.report['ProblemType'] = 'KernelCrash'
         QTimer.singleShot(0, QCoreApplication.quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.dialog.windowTitle(),
+            self.distro.split()[0])
         self.assertEqual(self.app.dialog.heading.text(),
               _('Sorry, %s has experienced an internal error.') % self.distro)
         self.assertTrue(self.app.dialog.send_error_report.isVisible())
@@ -115,6 +117,8 @@
         self.app.report['Package'] = 'apport 1.2.3~0ubuntu1'
         QTimer.singleShot(0, QCoreApplication.quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.dialog.windowTitle(),
+            self.distro.split()[0])
         self.assertEqual(self.app.dialog.heading.text(),
              _('Sorry, a problem occurred while installing software.'))
         self.assertTrue(self.app.dialog.send_error_report.isVisible())
@@ -147,6 +151,8 @@
             self.app.report['DesktopFile'] = fp.name
             QTimer.singleShot(0, QCoreApplication.quit)
             self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.dialog.windowTitle(),
+            self.distro.split()[0])
         self.assertEqual(self.app.dialog.heading.text(),
              _('The application Apport has closed unexpectedly.'))
         self.assertTrue(self.app.dialog.send_error_report.isVisible())
@@ -173,6 +179,8 @@
         self.app.report['Package'] = 'apport 1.2.3~0ubuntu1'
         QTimer.singleShot(0, QCoreApplication.quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.dialog.windowTitle(),
+            self.distro.split()[0])
         self.assertEqual(self.app.dialog.heading.text(),
              _('Sorry, %s has experienced an internal error.') % self.distro)
         self.assertEqual(self.app.dialog.text.text(),
@@ -201,6 +209,8 @@
         self.app.report_file = None
         QTimer.singleShot(0, QCoreApplication.quit)
         self.app.ui_present_report_details(True)
+        self.assertEqual(self.app.dialog.windowTitle(),
+            self.distro.split()[0])
         self.assertEqual(self.app.dialog.heading.text(),
              _('Send problem report to the developers?'))
         self.assertFalse(self.app.dialog.text.isVisible())