Merge lp:~cr3/checkbox/revert_sru into lp:checkbox

[Marc Tardif]

Only reverted SRU changes. There were other changes in revno 1148 about using the default.whitelist file which were preserved.

[Daniel Manrique (roadmr)]

Thanks, merging!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-02-01 14:47:34 +0000
+++ .bzrignore	2012-02-07 21:29:18 +0000
@@ -4,7 +4,6 @@
 debian/checkbox
 debian/checkbox-cli
 debian/checkbox-gtk
-debian/checkbox-sru
 debian/checkbox-urwid
 debian/*-cli.postrm
 debian/*.debhelper
@@ -14,7 +13,6 @@
 debian/stamp-patched
 debian/*.substvars
 debian/tmp
-debian/*-sru.postrm
 debian/*-urwid.postrm
 gtk/checkbox-gtk.glade.bak
 gtk/checkbox-gtk.gladep

=== removed file 'bin/checkbox-sru'
--- bin/checkbox-sru	2011-12-10 14:29:44 +0000
+++ bin/checkbox-sru	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
-export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
-export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/sru.whitelist}
-export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
-
-if [ $CHECKBOX_DATA != '.' ]
-then
-    old_data=$HOME/.checkbox
-    if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
-    then
-        mv -f $old_data $CHECKBOX_DATA
-    fi
-fi
-
-python $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini

=== removed file 'data/whitelists/sru.whitelist'
--- data/whitelists/sru.whitelist	2011-12-07 15:07:39 +0000
+++ data/whitelists/sru.whitelist	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-cdimage
-cpuinfo
-device
-dmi
-dpkg
-gconf
-lsb
-meminfo
-module
-package
-uname
-__info__
-codecs_attachment
-cpuinfo_attachment
-dmesg_attachment
-dmi_attachment
-dmidecode_attachment
-lsmod_attachment
-lspci_attachment
-gcov_attachment
-modprobe_attachment
-modules_attachment
-sysfs_attachment
-sysctl_attachment
-udev_attachment
-__sru__
-sru/suspend_success
-sru/hibernate_success

=== removed file 'debian/checkbox-sru.install'
--- debian/checkbox-sru.install	2011-12-07 04:34:49 +0000
+++ debian/checkbox-sru.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/bin/checkbox-sru
-usr/share/checkbox/examples/checkbox-sru.ini

=== removed file 'debian/checkbox-sru.links'
--- debian/checkbox-sru.links	2011-12-07 04:34:49 +0000
+++ debian/checkbox-sru.links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-sru.1.gz

=== removed file 'debian/checkbox-sru.postinst'
--- debian/checkbox-sru.postinst	2011-12-07 04:34:49 +0000
+++ debian/checkbox-sru.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#

=== modified file 'debian/control'
--- debian/control	2012-02-01 14:47:34 +0000
+++ debian/control	2012-02-07 21:29:18 +0000
@@ -46,12 +46,3 @@
  results can then be sent to Launchpad.
  .
  This package provides a GTK interface for answering tests.
-
-Package: checkbox-sru
-Architecture: all
-Depends: checkbox (>= ${source:Version}), ${misc:Depends}
-Description: SRU interface for checkbox 
- This project provides an extensible interface for system testing. The
- results can then be sent to Launchpad.
- .
- This package provides a non-interactive interface for SRU testing.

=== modified file 'debian/rules'
--- debian/rules	2012-02-01 14:47:34 +0000
+++ debian/rules	2012-02-07 21:29:18 +0000
@@ -7,7 +7,6 @@
 	cp debian/checkbox.postrm debian/checkbox-cli.postrm
 	cp debian/checkbox.postrm debian/checkbox-urwid.postrm
 	cp debian/checkbox.postrm debian/checkbox-gtk.postrm
-	cp debian/checkbox.postrm debian/checkbox-sru.postrm
 	dh_installdeb
 
 override_dh_installdocs:
@@ -15,11 +14,10 @@
 	dh_installdocs -pcheckbox-cli ./README 
 	dh_installdocs -pcheckbox-urwid ./README 
 	dh_installdocs -pcheckbox-gtk ./README 
-	dh_installdocs -pcheckbox-sru ./README 
 	dh_installdocs
 
 override_dh_clean:
 	-find . -name \*.mo -exec rm {} \;
-	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-sru.postrm
+	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm
 	debconf-updatepo
 	dh_clean

=== removed file 'examples/checkbox-sru.ini'
--- examples/checkbox-sru.ini	2011-12-07 04:34:49 +0000
+++ examples/checkbox-sru.ini	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[DEFAULT]
-
-# Space separated list of files to include as a dependency for the
-# SRU interface.
-includes = %(checkbox_share)s/configs/checkbox.ini

=== removed file 'jobs/sru.txt.in'
--- jobs/sru.txt.in	2011-12-07 04:34:49 +0000
+++ jobs/sru.txt.in	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-name: __sru__
-plugin: remote
-_description: SRU tests.
-command: sru_suspend

=== removed file 'scripts/sru_suspend'
--- scripts/sru_suspend	2011-12-12 14:43:55 +0000
+++ scripts/sru_suspend	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#!/bin/bash
-#
-# Simplistic test to determine whether the system successfully resumed
-# from suspend and thawed from hibernate.
-
-if zgrep -q '/usr/lib/pm-utils/sleep.d/000kernel-change resume suspend: success.' /var/log/pm-suspend.log*; then
-    suspend_status="pass"
-else
-    suspend_status="untested"
-fi
-
-if zgrep -q '/usr/lib/pm-utils/sleep.d/000kernel-change thaw hibernate: success.' /var/log/pm-suspend.log*; then
-    hibernate_status="pass"
-else
-    hibernate_status="untested"
-fi
-
-cat <<EOF
-plugin: shell
-name: sru/suspend_success
-status: $suspend_status
-description:
- Check that /var/log/pm-suspend.log contains the string:
- resume suspend: success.
-
-plugin: shell
-name: sru/hibernate_success
-status: $hibernate_status
-description:
- Check that /var/log/pm-suspend.log contains the string:
- thaw hibernate: success.
-
-EOF

=== modified file 'setup.py'
--- setup.py	2012-01-25 13:55:09 +0000
+++ setup.py	2012-02-07 21:29:18 +0000
@@ -230,8 +230,7 @@
         ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
         ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
         ("share/apport/general-hooks/", ["apport/checkbox.py"])],
-    scripts = ["bin/checkbox-cli", "bin/checkbox-gtk", "bin/checkbox-sru",
-        "bin/checkbox-urwid"],
+    scripts = ["bin/checkbox-cli", "bin/checkbox-gtk", "bin/checkbox-urwid"],
     packages = ["checkbox", "checkbox.contrib", "checkbox.lib", "checkbox.parsers",
         "checkbox.reports", "checkbox_cli", "checkbox_gtk", "checkbox_urwid"],
     package_data = {