ubuntu-bugcontrol team mailing list archive
-
ubuntu-bugcontrol team
-
Mailing list archive
-
Message #03929
[Merge] lp:~nuclearbob/qa-regression-testing/import-cleanup into lp:qa-regression-testing
Max Brustkern has proposed merging lp:~nuclearbob/qa-regression-testing/import-cleanup into lp:qa-regression-testing.
Requested reviews:
Ubuntu Bug Control (ubuntu-bugcontrol)
For more details, see:
https://code.launchpad.net/~nuclearbob/qa-regression-testing/import-cleanup/+merge/185167
test-avahi.py was failing to import gobject, but it didn't use gobject, and passed when the import was removed.
I ran pyflakes and found a lot of imports that seemed to be unnecessary. I left in the private test ones, as well as any import that was only referred to in commented-out lines. I also found a few imports that appeared to be missing, and added those.
Finally, I removed a duplicated function and cleaned up a few cases where functions seemed to use variables that didn't quite match the function arguments.
--
https://code.launchpad.net/~nuclearbob/qa-regression-testing/import-cleanup/+merge/185167
Your team Ubuntu Bug Control is requested to review the proposed merge of lp:~nuclearbob/qa-regression-testing/import-cleanup into lp:qa-regression-testing.
=== modified file 'scripts/dbus/example-async-client.py'
--- scripts/dbus/example-async-client.py 2011-05-24 22:12:51 +0000
+++ scripts/dbus/example-async-client.py 2013-09-11 21:20:40 +0000
@@ -61,18 +61,6 @@
if hello_replied and raise_replied:
loop.quit()
-def handle_hello_error(e):
- global failed
- global hello_replied
- hello_replied = True
- failed = True
-
- print "HelloWorld raised an exception! That's not meant to happen..."
- print "\t", str(e)
-
- if hello_replied and raise_replied:
- loop.quit()
-
def handle_raise_reply():
global failed
global raise_replied
=== modified file 'scripts/kernel-security/proc-maps/maps-protection.py'
--- scripts/kernel-security/proc-maps/maps-protection.py 2011-06-02 22:00:35 +0000
+++ scripts/kernel-security/proc-maps/maps-protection.py 2013-09-11 21:20:40 +0000
@@ -10,7 +10,7 @@
# Author: Kees Cook <kees@xxxxxxxxxx>
# License: GPLv3
-import sys, os, unittest, errno
+import os, unittest, errno
from subprocess import *
def maps_readable(pid, command=None, expected=None):
=== modified file 'scripts/python-pam/pamtest.py'
--- scripts/python-pam/pamtest.py 2012-03-08 16:16:44 +0000
+++ scripts/python-pam/pamtest.py 2013-09-11 21:20:40 +0000
@@ -2,7 +2,6 @@
import sys
import PAM
-from getpass import getpass
def pam_conv(auth, query_list, userData):
=== modified file 'scripts/shadow/gen-evil-utmp.py'
--- scripts/shadow/gen-evil-utmp.py 2008-12-22 22:00:26 +0000
+++ scripts/shadow/gen-evil-utmp.py 2013-09-11 21:20:40 +0000
@@ -2,7 +2,6 @@
# python utmp doesn't work on all releases
import utmp
from UTMPCONST import *
-import time, os, string
# "touch"
file('/tmp/utmp.bogus','w').close()
# add record...
=== modified file 'scripts/test-acpid.py'
--- scripts/test-acpid.py 2011-10-04 19:22:32 +0000
+++ scripts/test-acpid.py 2013-09-11 21:20:40 +0000
@@ -34,7 +34,7 @@
'''
-import unittest, subprocess, sys, os, stat
+import unittest, sys, os, stat
import testlib
use_private = True
=== modified file 'scripts/test-avahi.py'
--- scripts/test-avahi.py 2011-10-05 21:14:09 +0000
+++ scripts/test-avahi.py 2013-09-11 21:20:40 +0000
@@ -31,9 +31,7 @@
import unittest, os, sys, time, re
import testlib
import dbus
-import gobject
import avahi
-import time
class AvahiTest(unittest.TestCase):
'''Test Avahi functionality.'''
=== modified file 'scripts/test-built-binaries.py'
--- scripts/test-built-binaries.py 2012-08-21 16:37:29 +0000
+++ scripts/test-built-binaries.py 2013-09-11 21:20:40 +0000
@@ -30,7 +30,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, urllib2, glob, re
+import unittest, subprocess, sys, os, tempfile, glob, re
import testlib
try:
=== modified file 'scripts/test-bzip2.py'
--- scripts/test-bzip2.py 2011-12-14 23:04:30 +0000
+++ scripts/test-bzip2.py 2013-09-11 21:20:40 +0000
@@ -29,10 +29,10 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit lsb-release bzip2 file && ./test-bzip2.py -v'
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import testlib_compressor
-import tempfile, os, shutil, subprocess
+import tempfile, os, shutil
recurse_directory = ""
=== modified file 'scripts/test-ca-certificates.py'
--- scripts/test-ca-certificates.py 2011-09-21 20:59:28 +0000
+++ scripts/test-ca-certificates.py 2013-09-11 21:20:40 +0000
@@ -33,12 +33,11 @@
# QRT-Packages: w3m apache2-mpm-prefork ssl-cert openssl ca-certificates lsb-release python-pexpect
# QRT-Privilege: root
-import unittest, subprocess, sys, os, shutil, time
+import unittest, sys, os, shutil, time
import testlib
import testlib_httpd
import testlib_ssl
import tempfile
-import time
import pexpect
class TestCommon(testlib_httpd.HttpdCommon):
=== modified file 'scripts/test-clamav.py'
--- scripts/test-clamav.py 2013-03-20 20:30:13 +0000
+++ scripts/test-clamav.py 2013-09-11 21:20:40 +0000
@@ -38,8 +38,8 @@
# QRT-Depends: private/qrt/clamav.py clamav/
# QRT-Packages: clamav clamav-daemon zip bzip2 mpack clamav-testfiles clamav-milter sudo rar
-import unittest, subprocess, shutil, grp, os, os.path, sys, time, socket
-import tempfile, shutil, testlib
+import unittest, subprocess, shutil, os, os.path, sys, time, socket
+import tempfile, testlib
import glob
import stat
import pwd
=== modified file 'scripts/test-coreutils.py'
--- scripts/test-coreutils.py 2010-02-03 18:03:38 +0000
+++ scripts/test-coreutils.py 2013-09-11 21:20:40 +0000
@@ -30,8 +30,7 @@
import unittest
import testlib
-import os
-import tempfile
+import sys
class CoreutilsTest(testlib.TestlibCase):
'''Test coreutils package functionality'''
=== modified file 'scripts/test-cpio.py'
--- scripts/test-cpio.py 2010-01-14 04:00:17 +0000
+++ scripts/test-cpio.py 2013-09-11 21:20:40 +0000
@@ -32,12 +32,12 @@
# QRT-Depends: testlib_archive.py
# QRT-Packages: cpio
-import unittest, subprocess
+import unittest
import testlib
import testlib_archive
import os
-import tempfile
import time
+import sys
class CpioTests(testlib_archive.ArchiveCommon):
def setUp(self):
=== modified file 'scripts/test-curl.py'
--- scripts/test-curl.py 2013-06-28 13:52:45 +0000
+++ scripts/test-curl.py 2013-09-11 21:20:40 +0000
@@ -24,7 +24,7 @@
# QRT-Packages: curl
-import unittest, subprocess, sys
+import unittest, sys
import base64
import testlib
import threading
=== modified file 'scripts/test-cvs.py'
--- scripts/test-cvs.py 2012-02-24 15:28:31 +0000
+++ scripts/test-cvs.py 2013-09-11 21:20:40 +0000
@@ -39,7 +39,7 @@
import unittest, subprocess, sys, os
-import tempfile, shutil, time
+import tempfile, time
import testlib
try:
=== modified file 'scripts/test-dash.py'
--- scripts/test-dash.py 2011-04-26 00:09:34 +0000
+++ scripts/test-dash.py 2013-09-11 21:20:40 +0000
@@ -23,7 +23,7 @@
'''
# QRT-Privilege: root
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
class DashTest(testlib.TestlibCase):
=== modified file 'scripts/test-dbus.py'
--- scripts/test-dbus.py 2013-08-28 00:39:43 +0000
+++ scripts/test-dbus.py 2013-09-11 21:20:40 +0000
@@ -40,10 +40,9 @@
# QRT-Packages: build-essential pkg-config libdbus-1-dev dbus-x11 libdbus-glib-1-dev
# QRT-Privilege: root
-import unittest, subprocess, shutil, grp, os, os.path, sys, time, atexit
+import unittest, shutil, os, os.path, sys, time, atexit
import tempfile, testlib
-import glob
import gobject
import dbus
import dbus.service
=== modified file 'scripts/test-devscripts.py'
--- scripts/test-devscripts.py 2012-10-02 19:32:37 +0000
+++ scripts/test-devscripts.py 2013-09-11 21:20:40 +0000
@@ -30,7 +30,7 @@
'''
-import unittest, subprocess, sys
+import unittest
import shutil
import testlib
import os
=== modified file 'scripts/test-dovecot.py'
--- scripts/test-dovecot.py 2013-02-20 20:36:50 +0000
+++ scripts/test-dovecot.py 2013-09-11 21:20:40 +0000
@@ -34,7 +34,7 @@
# QRT-Alternates: dovecot-sieve
# QRT-Privilege: root
-import unittest, subprocess, shutil, grp, os, os.path, sys, time, glob
+import unittest, subprocess, os, os.path, sys, glob
import imaplib, poplib
import testlib
=== modified file 'scripts/test-dpkg.py'
--- scripts/test-dpkg.py 2012-09-28 02:20:46 +0000
+++ scripts/test-dpkg.py 2013-09-11 21:20:40 +0000
@@ -30,7 +30,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import tempfile
=== modified file 'scripts/test-dvipng.py'
--- scripts/test-dvipng.py 2011-09-12 23:48:59 +0000
+++ scripts/test-dvipng.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, re
+import unittest, sys, os, tempfile
import testlib
try:
=== modified file 'scripts/test-elinks.py'
--- scripts/test-elinks.py 2010-01-15 01:11:32 +0000
+++ scripts/test-elinks.py 2013-09-11 21:20:40 +0000
@@ -50,7 +50,6 @@
import unittest, subprocess, sys, os, shutil, time
import testlib
import tempfile
-import time
smb_url = ""
=== modified file 'scripts/test-eog.py'
--- scripts/test-eog.py 2010-01-15 01:11:32 +0000
+++ scripts/test-eog.py 2013-09-11 21:20:40 +0000
@@ -29,8 +29,7 @@
# QRT-Depends: testlib_data.py
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_data
class TestImages(testlib_data.DataCommon):
=== modified file 'scripts/test-erlang.py'
--- scripts/test-erlang.py 2010-04-09 14:39:26 +0000
+++ scripts/test-erlang.py 2013-09-11 21:20:40 +0000
@@ -36,7 +36,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import tempfile
=== modified file 'scripts/test-evince.py'
--- scripts/test-evince.py 2013-03-28 14:27:44 +0000
+++ scripts/test-evince.py 2013-09-11 21:20:40 +0000
@@ -33,7 +33,7 @@
# QRT-Depends: testlib_data.py private/qrt/pdfs.py
# QRT-Packages: evince firefox apparmor-docs apparmor apparmor-utils unrar p7zip|p7zip-full unzip texlive-extra-utils
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import testlib_data
import tempfile
=== modified file 'scripts/test-exim4.py'
--- scripts/test-exim4.py 2012-10-26 12:12:47 +0000
+++ scripts/test-exim4.py 2013-09-11 21:20:40 +0000
@@ -49,7 +49,7 @@
- lots more (see http://wiki.debian.org/PkgExim4UserFAQ for ideas)
'''
-import unittest, subprocess, re, smtplib, socket, os, time, tempfile, stat
+import unittest, subprocess, smtplib, socket, os, time
import testlib
class Exim4Test(testlib.TestlibCase):
=== modified file 'scripts/test-exiv2.py'
--- scripts/test-exiv2.py 2010-01-05 19:25:38 +0000
+++ scripts/test-exiv2.py 2013-09-11 21:20:40 +0000
@@ -25,7 +25,7 @@
# QRT-Depends: exiv2 private/qrt/exiv2.py
# QRT-Packages: exiv2
-import unittest, subprocess, sys, shutil
+import unittest, sys, shutil
import testlib, tempfile
try:
=== modified file 'scripts/test-expat.py'
--- scripts/test-expat.py 2010-01-20 18:25:48 +0000
+++ scripts/test-expat.py 2013-09-11 21:20:40 +0000
@@ -28,7 +28,7 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit expat tar && ./test-expat.py -v'
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import os
import tempfile
=== modified file 'scripts/test-fastjar.py'
--- scripts/test-fastjar.py 2010-06-18 16:55:34 +0000
+++ scripts/test-fastjar.py 2013-09-11 21:20:40 +0000
@@ -29,7 +29,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, time
+import unittest, sys, os
import testlib
import testlib_archive
=== modified file 'scripts/test-feedparser.py'
--- scripts/test-feedparser.py 2012-05-22 18:26:05 +0000
+++ scripts/test-feedparser.py 2013-09-11 21:20:40 +0000
@@ -40,7 +40,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import tempfile
import feedparser
=== modified file 'scripts/test-fetchmail.py'
--- scripts/test-fetchmail.py 2012-02-09 20:11:52 +0000
+++ scripts/test-fetchmail.py 2013-09-11 21:20:40 +0000
@@ -27,9 +27,8 @@
# QRT-Alternates: python-openssl python-pyopenssl
# QRT-Privilege: root
-import unittest, subprocess, sys, time, tempfile, os, re, shutil, socket
+import unittest, subprocess, tempfile, os, re, shutil
import SocketServer
-import string
import testlib
import testlib_dovecot
=== modified file 'scripts/test-ffmpeg.py'
--- scripts/test-ffmpeg.py 2012-06-13 19:15:02 +0000
+++ scripts/test-ffmpeg.py 2013-09-11 21:20:40 +0000
@@ -37,7 +37,7 @@
'''
-import unittest, subprocess, sys, os, tempfile
+import unittest, sys, os, tempfile
import testlib
try:
=== modified file 'scripts/test-file.py'
--- scripts/test-file.py 2010-01-15 01:11:32 +0000
+++ scripts/test-file.py 2013-09-11 21:20:40 +0000
@@ -29,7 +29,7 @@
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import os
=== modified file 'scripts/test-freeradius.py'
--- scripts/test-freeradius.py 2012-09-26 14:06:08 +0000
+++ scripts/test-freeradius.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
'''
-import unittest, subprocess, sys, tempfile, os, socket, time
+import unittest, sys, tempfile, os, socket, time
import testlib
try:
=== modified file 'scripts/test-freetype.py'
--- scripts/test-freetype.py 2013-01-14 18:55:19 +0000
+++ scripts/test-freetype.py 2013-09-11 21:20:40 +0000
@@ -33,8 +33,7 @@
# QRT-Depends: testlib_data.py private/qrt/freetype.py
# QRT-Packages: freetype2-demos valgrind
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_data
use_private = True
=== modified file 'scripts/test-fuse.py'
--- scripts/test-fuse.py 2011-05-05 19:32:47 +0000
+++ scripts/test-fuse.py 2013-09-11 21:20:40 +0000
@@ -36,13 +36,11 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
-import time
import shutil
import re
import tempfile
-import os
use_private = True
try:
=== modified file 'scripts/test-fwlogwatch.py'
--- scripts/test-fwlogwatch.py 2013-05-10 22:36:57 +0000
+++ scripts/test-fwlogwatch.py 2013-09-11 21:20:40 +0000
@@ -48,7 +48,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
try:
=== modified file 'scripts/test-gcc-security.py'
--- scripts/test-gcc-security.py 2012-06-22 22:30:52 +0000
+++ scripts/test-gcc-security.py 2013-09-11 21:20:40 +0000
@@ -25,8 +25,8 @@
Cannot run as root.
'''
-import unittest, subprocess, struct
-import os, sys
+import unittest, subprocess
+import os
import testlib
class GccSecurityTest00(testlib.TestlibCase):
=== modified file 'scripts/test-ghostscript.py'
--- scripts/test-ghostscript.py 2012-01-04 15:14:33 +0000
+++ scripts/test-ghostscript.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
# QRT-Depends: data private/qrt/ghostscript.py
# QRT-Packages: ghostscript file
-import unittest, subprocess, os, tempfile
+import unittest, os, tempfile
import sys
import testlib
=== modified file 'scripts/test-glib2.0.py'
--- scripts/test-glib2.0.py 2010-01-11 19:54:18 +0000
+++ scripts/test-glib2.0.py 2013-09-11 21:20:40 +0000
@@ -29,7 +29,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
try:
=== modified file 'scripts/test-glibc-security.py'
--- scripts/test-glibc-security.py 2011-03-10 17:51:12 +0000
+++ scripts/test-glibc-security.py 2013-09-11 21:20:40 +0000
@@ -27,8 +27,8 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit build-essential && ./test-glibc-security.py -v'
'''
-import unittest, subprocess, struct
-import os, sys
+import unittest
+import os
import testlib
class GlibcSecurityTest(testlib.TestlibCase):
=== modified file 'scripts/test-glibc.py'
--- scripts/test-glibc.py 2012-09-28 19:02:26 +0000
+++ scripts/test-glibc.py 2013-09-11 21:20:40 +0000
@@ -29,8 +29,8 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit build-essential gcc-multilib && ./test-glibc.py -v'
'''
-import unittest, subprocess, struct, glob
-import os, sys
+import unittest, glob
+import os
import testlib
class GlibcTest(testlib.TestlibCase):
=== modified file 'scripts/test-gnupg.py'
--- scripts/test-gnupg.py 2013-01-09 15:48:07 +0000
+++ scripts/test-gnupg.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
would be better to have some "role" key on the keyservers to use.
'''
-import unittest, subprocess, shutil, grp, os, os.path, sys, time
+import unittest, subprocess, os, os.path, sys
import tempfile
import testlib
=== modified file 'scripts/test-gnutls.py'
--- scripts/test-gnutls.py 2013-02-26 20:09:45 +0000
+++ scripts/test-gnutls.py 2013-09-11 21:20:40 +0000
@@ -29,13 +29,12 @@
http://www.gnu.org/software/gnutls/manual/html_node/Invoking-gnutls_002dserv.html
'''
-# QRT-Depends: ssl testlib_ssl.py gnutls
+# QRT-Depends: ssl gnutls
# QRT-Packages: python-unit gnutls-bin python-pexpect ca-certificates ssl-cert iputils-ping libgnutls-dev build-essential sudo libtasn1-3-dev
# QRT-Privilege: root
import unittest, subprocess, sys
import testlib
-import testlib_ssl
import re
import os
import time
=== modified file 'scripts/test-gstreamer.py'
--- scripts/test-gstreamer.py 2010-01-07 22:02:24 +0000
+++ scripts/test-gstreamer.py 2013-09-11 21:20:40 +0000
@@ -48,7 +48,7 @@
# QRT-Depends: data testlib_multimedia.py
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import testlib_multimedia
=== modified file 'scripts/test-gzip.py'
--- scripts/test-gzip.py 2011-04-21 23:44:59 +0000
+++ scripts/test-gzip.py 2013-09-11 21:20:40 +0000
@@ -29,10 +29,9 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit lsb-release gzip file && ./test-gzip.py -v'
'''
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_compressor
-import tempfile, os, subprocess
+import os
recurse_directory = ""
=== modified file 'scripts/test-haproxy.py'
--- scripts/test-haproxy.py 2013-04-15 18:18:47 +0000
+++ scripts/test-haproxy.py 2013-09-11 21:20:40 +0000
@@ -38,7 +38,7 @@
$ schroot -c precise -u root -- sh -c 'apt-get -y install lsb-release python-unit <QRT-Packages> && ./test-haproxy.py -v'
'''
-import unittest, subprocess, sys, os
+import unittest, sys
import testlib
import testlib_httpd
=== modified file 'scripts/test-hello.py'
--- scripts/test-hello.py 2012-10-05 03:16:52 +0000
+++ scripts/test-hello.py 2013-09-11 21:20:40 +0000
@@ -43,7 +43,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys
import testlib
class HelloTest(testlib.TestlibCase):
=== modified file 'scripts/test-imagemagick.py'
--- scripts/test-imagemagick.py 2012-05-01 14:36:11 +0000
+++ scripts/test-imagemagick.py 2013-09-11 21:20:40 +0000
@@ -30,7 +30,7 @@
# QRT-Depends: data imagemagick private/qrt/imagemagick.py
# QRT-Packages: file imagemagick libtiff-tools
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import shutil
import tempfile
=== modified file 'scripts/test-imlib2.py'
--- scripts/test-imlib2.py 2011-09-12 23:48:59 +0000
+++ scripts/test-imlib2.py 2013-09-11 21:20:40 +0000
@@ -27,10 +27,9 @@
# QRT-Depends: data imlib2
-import unittest, subprocess, sys, os
+import unittest, os
import testlib
import tempfile
-import re
class Imlib2Tests(testlib.TestlibCase):
'''Test imlib2 functionality.'''
=== modified file 'scripts/test-ipsec-tools.py'
--- scripts/test-ipsec-tools.py 2011-07-29 19:26:28 +0000
+++ scripts/test-ipsec-tools.py 2013-09-11 21:20:40 +0000
@@ -45,7 +45,7 @@
sudo ./test-ipsec-tools.py psk 10.0.0.22 192.168.22.0/24 10.0.0.10 192.168.10.0/24 -v
'''
-import unittest, subprocess, sys, time, os
+import unittest, sys, time, os
import testlib
iface = None
=== modified file 'scripts/test-jasper.py'
--- scripts/test-jasper.py 2011-12-20 14:31:57 +0000
+++ scripts/test-jasper.py 2013-09-11 21:20:40 +0000
@@ -34,7 +34,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib, testlib_data
import tempfile
=== modified file 'scripts/test-kdeutils.py'
--- scripts/test-kdeutils.py 2011-11-08 21:45:58 +0000
+++ scripts/test-kdeutils.py 2013-09-11 21:20:40 +0000
@@ -20,13 +20,11 @@
# QRT-Depends: testlib_data.py testlib_archive.py
# QRT-Packages: kdeutils
-import unittest, subprocess
+import unittest
import testlib
import testlib_archive
import testlib_data
import os
-import tempfile
-import time
import sys
class ArkTests(testlib_data.DataCommon, testlib_archive.ArchiveCommon):
=== modified file 'scripts/test-kernel-hardening.py'
--- scripts/test-kernel-hardening.py 2011-02-25 22:25:46 +0000
+++ scripts/test-kernel-hardening.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, shutil
+import unittest, sys, os, tempfile, shutil
import testlib
try:
=== modified file 'scripts/test-kernel-panic.py'
--- scripts/test-kernel-panic.py 2013-05-14 18:23:29 +0000
+++ scripts/test-kernel-panic.py 2013-09-11 21:20:40 +0000
@@ -37,7 +37,7 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install build-essential libc6-dev-i386 python-unit && ./test-kernel-panic.py -v'
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
try:
=== modified file 'scripts/test-kernel-root-ops.py'
--- scripts/test-kernel-root-ops.py 2012-12-18 00:44:39 +0000
+++ scripts/test-kernel-root-ops.py 2013-09-11 21:20:40 +0000
@@ -21,8 +21,7 @@
# QRT-Packages: python-unit
# QRT-Depends:
-import unittest, subprocess, struct
-import os, sys, tempfile
+import unittest
import testlib
try:
=== modified file 'scripts/test-kernel-security.py'
--- scripts/test-kernel-security.py 2013-05-24 18:13:18 +0000
+++ scripts/test-kernel-security.py 2013-09-11 21:20:40 +0000
@@ -44,8 +44,8 @@
# QRT-Depends: kernel-security private/qrt/kernel_security.py
-import unittest, subprocess, struct, socket, time
-import os, sys, tempfile, shutil, signal, re, gzip
+import unittest, subprocess, socket, time
+import os, tempfile, shutil, signal, re, gzip
import testlib
try:
=== modified file 'scripts/test-kernel.py'
--- scripts/test-kernel.py 2012-01-23 14:27:39 +0000
+++ scripts/test-kernel.py 2013-09-11 21:20:40 +0000
@@ -32,8 +32,8 @@
# QRT-Depends: kernel private/kernel private/qrt/kernel.py
-import unittest, subprocess, struct
-import os, sys, tempfile
+import unittest
+import os
import testlib
try:
=== modified file 'scripts/test-krb5.py'
--- scripts/test-krb5.py 2011-03-15 18:01:20 +0000
+++ scripts/test-krb5.py 2013-09-11 21:20:40 +0000
@@ -38,7 +38,7 @@
# QRT-Packages: python-pexpect krb5-admin-server krb5-kdc krb5-config krb5-user krb5-clients
# QRT-Privilege: root
-import unittest, subprocess, time, signal, socket, glob, os, pexpect
+import unittest, subprocess, time, socket, glob, os, pexpect
import testlib
class KerberosSettings(object):
=== modified file 'scripts/test-language-selector.py'
--- scripts/test-language-selector.py 2011-04-19 18:11:47 +0000
+++ scripts/test-language-selector.py 2013-09-11 21:20:40 +0000
@@ -39,7 +39,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
try:
=== modified file 'scripts/test-lcms.py'
--- scripts/test-lcms.py 2011-09-12 23:48:59 +0000
+++ scripts/test-lcms.py 2013-09-11 21:20:40 +0000
@@ -26,7 +26,7 @@
# QRT-Depends: data lcms private/qrt/lcms.py
# QRT-Packages: liblcms-utils file
-import unittest, subprocess, sys, tempfile, os
+import unittest, sys, tempfile, os
import testlib
use_private = True
=== modified file 'scripts/test-lftp.py'
--- scripts/test-lftp.py 2011-01-22 02:19:42 +0000
+++ scripts/test-lftp.py 2013-09-11 21:20:40 +0000
@@ -42,10 +42,7 @@
import testlib_httpd
import testlib_ssl
import tempfile
-import time
-import shutil
import sys
-import socket
class BasicTest(testlib_httpd.HttpdCommon):
'''Test basic functionality'''
=== modified file 'scripts/test-libarchive.py'
--- scripts/test-libarchive.py 2011-12-16 15:47:01 +0000
+++ scripts/test-libarchive.py 2013-09-11 21:20:40 +0000
@@ -37,11 +37,9 @@
$ schroot -c lucid -u root -- sh -c 'apt-get -y install lsb-release python-unit <QRT-Packages> && ./test-libarchive.py -v'
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import testlib_archive
-import tempfile
-import time
use_private = True
try:
=== modified file 'scripts/test-libcompress-raw-zlib-perl.py'
--- scripts/test-libcompress-raw-zlib-perl.py 2010-01-15 01:11:32 +0000
+++ scripts/test-libcompress-raw-zlib-perl.py 2013-09-11 21:20:40 +0000
@@ -33,7 +33,7 @@
schroot -c jaunty -u root -- sh -c 'apt-get -y install python-unit lsb-release libcompress-raw-zlib-perl && ./test-libcompress-raw-zlib-perl.py -v'
'''
-import unittest, subprocess, sys, tempfile, os
+import unittest, sys, tempfile, os
import testlib
use_private = True
=== modified file 'scripts/test-libconfig-inifiles-perl.py'
--- scripts/test-libconfig-inifiles-perl.py 2012-08-17 13:53:09 +0000
+++ scripts/test-libconfig-inifiles-perl.py 2013-09-11 21:20:40 +0000
@@ -41,7 +41,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import tempfile
import testlib
=== modified file 'scripts/test-libexif.py'
--- scripts/test-libexif.py 2011-04-26 16:51:27 +0000
+++ scripts/test-libexif.py 2013-09-11 21:20:40 +0000
@@ -25,7 +25,7 @@
# QRT-Depends: libexif private/qrt/libexif.py
# QRT-Packages: exif
-import unittest, subprocess, sys
+import unittest, sys
import testlib, tempfile
try:
=== modified file 'scripts/test-libfs.py'
--- scripts/test-libfs.py 2013-06-03 17:32:46 +0000
+++ scripts/test-libfs.py 2013-09-11 21:20:40 +0000
@@ -45,7 +45,7 @@
'''
-import unittest, subprocess, sys, os, time
+import unittest, sys, os, time
import testlib
try:
=== modified file 'scripts/test-libgc.py'
--- scripts/test-libgc.py 2012-08-02 21:16:27 +0000
+++ scripts/test-libgc.py 2013-09-11 21:20:40 +0000
@@ -38,7 +38,7 @@
$ schroot -c lucid -u root -- sh -c 'apt-get -y install lsb-release python-unit <QRT-Packages> && ./test-PKG.py -v'
'''
-import unittest, subprocess, sys, os
+import unittest, sys
import testlib
use_private = True
=== modified file 'scripts/test-libgd2.py'
--- scripts/test-libgd2.py 2011-09-12 23:48:59 +0000
+++ scripts/test-libgd2.py 2013-09-11 21:20:40 +0000
@@ -28,9 +28,8 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit lsb-release file libgd-tools php5-cli php5-gd && ./test-libgd2.py -v'
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
-import shutil
import tempfile, os
use_private = True
=== modified file 'scripts/test-libhtml-parser-perl.py'
--- scripts/test-libhtml-parser-perl.py 2010-01-15 01:11:32 +0000
+++ scripts/test-libhtml-parser-perl.py 2013-09-11 21:20:40 +0000
@@ -28,7 +28,7 @@
schroot -c jaunty -u root -- sh -c 'apt-get -y install python-unit lsb-release libhtml-parser-perl && ./test-libhtml-parser-perl.py -v'
'''
-import unittest, subprocess, sys, tempfile, os
+import unittest, sys, tempfile, os
import testlib
use_private = True
=== modified file 'scripts/test-libhx.py'
--- scripts/test-libhx.py 2010-09-27 13:32:53 +0000
+++ scripts/test-libhx.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, shutil
+import unittest, sys, os, tempfile, shutil
import testlib
try:
=== modified file 'scripts/test-libmodplug.py'
--- scripts/test-libmodplug.py 2011-06-13 15:20:11 +0000
+++ scripts/test-libmodplug.py 2013-09-11 21:20:40 +0000
@@ -32,8 +32,7 @@
'''
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_data
use_private = True
=== modified file 'scripts/test-libnet-dns-perl.py'
--- scripts/test-libnet-dns-perl.py 2010-01-11 20:41:22 +0000
+++ scripts/test-libnet-dns-perl.py 2013-09-11 21:20:40 +0000
@@ -25,7 +25,7 @@
'''
# QRT-Packages: libnet-dns-perl bind9-host netbase
-import unittest, subprocess, os, sys, time
+import unittest, subprocess
import testlib
class LibNetDnsPerlTest(unittest.TestCase):
=== modified file 'scripts/test-libnss-db.py'
--- scripts/test-libnss-db.py 2011-02-25 22:25:46 +0000
+++ scripts/test-libnss-db.py 2013-09-11 21:20:40 +0000
@@ -29,7 +29,7 @@
'''
-import unittest, subprocess, sys, os, glob, tempfile, shutil
+import unittest, sys, os, glob, tempfile, shutil
import testlib
try:
=== modified file 'scripts/test-libpng.py'
--- scripts/test-libpng.py 2012-04-05 17:54:12 +0000
+++ scripts/test-libpng.py 2013-09-11 21:20:40 +0000
@@ -39,7 +39,7 @@
# QRT-Depends: testlib_multimedia.py testlib_png data private/qrt/libpng.py
# QRT-Packages: unzip pngtools python-pexpect pngcrush
-import unittest, os, subprocess, sys
+import unittest, os, sys
import tempfile
import testlib
import testlib_multimedia
=== modified file 'scripts/test-libraw.py'
--- scripts/test-libraw.py 2013-06-17 19:00:47 +0000
+++ scripts/test-libraw.py 2013-09-11 21:20:40 +0000
@@ -47,7 +47,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, shutil, re
+import unittest, sys, os, tempfile, shutil, re
import testlib
try:
=== modified file 'scripts/test-librsvg.py'
--- scripts/test-librsvg.py 2011-09-12 23:48:59 +0000
+++ scripts/test-librsvg.py 2013-09-11 21:20:40 +0000
@@ -30,7 +30,7 @@
'''
-import unittest, subprocess, sys, tempfile, re, os
+import unittest, sys, tempfile, os
import testlib
try:
=== modified file 'scripts/test-libsndfile.py'
--- scripts/test-libsndfile.py 2012-01-10 09:32:35 +0000
+++ scripts/test-libsndfile.py 2013-09-11 21:20:40 +0000
@@ -33,7 +33,7 @@
# QRT-Depends: data
# QRT-Packages: python-unit lsb-release file sndfile-programs
-import unittest, subprocess, sys, os
+import unittest, os
import shutil
import testlib
import tempfile
=== modified file 'scripts/test-libsoup2.4.py'
--- scripts/test-libsoup2.4.py 2011-07-28 22:43:32 +0000
+++ scripts/test-libsoup2.4.py 2013-09-11 21:20:40 +0000
@@ -50,7 +50,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import shutil
import tempfile
import testlib
=== modified file 'scripts/test-libvirt-lxc.py'
--- scripts/test-libvirt-lxc.py 2012-08-13 18:42:15 +0000
+++ scripts/test-libvirt-lxc.py 2013-09-11 21:20:40 +0000
@@ -26,7 +26,7 @@
# QRT-Packages: python-pexpect build-essential libvirt-bin lxc
# QRT-Privilege: root
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import os
import pexpect
=== modified file 'scripts/test-libvirt.py'
--- scripts/test-libvirt.py 2013-01-29 16:46:28 +0000
+++ scripts/test-libvirt.py 2013-09-11 21:20:40 +0000
@@ -78,7 +78,6 @@
import pexpect
import re
import shutil
-import sys
import tempfile
import time
import xml.dom.minidom
=== modified file 'scripts/test-libvorbis.py'
--- scripts/test-libvorbis.py 2012-02-20 17:48:58 +0000
+++ scripts/test-libvorbis.py 2013-09-11 21:20:40 +0000
@@ -28,7 +28,7 @@
# QRT-Depends: data libvorbis
# QRT-Packages: file vorbis-tools
-import unittest, subprocess, sys, os
+import unittest, os
import testlib
import tempfile
=== modified file 'scripts/test-libvpx.py'
--- scripts/test-libvpx.py 2012-01-10 09:32:35 +0000
+++ scripts/test-libvpx.py 2013-09-11 21:20:40 +0000
@@ -43,7 +43,6 @@
import glob
import testlib
import testlib_multimedia
-import time
try:
from private.qrt.libvpx import PrivateLibvpxTest
=== modified file 'scripts/test-libwmf.py'
--- scripts/test-libwmf.py 2010-01-15 01:11:32 +0000
+++ scripts/test-libwmf.py 2013-09-11 21:20:40 +0000
@@ -25,7 +25,7 @@
# QRT-Depends: data private/qrt/libwmf.py
# QRT-Packages: file libwmf-bin
-import unittest, subprocess, sys, tempfile, os, shutil
+import unittest, sys, tempfile, os, shutil
import testlib
use_private = True
=== modified file 'scripts/test-libwww-perl.py'
--- scripts/test-libwww-perl.py 2010-08-30 20:17:44 +0000
+++ scripts/test-libwww-perl.py 2013-09-11 21:20:40 +0000
@@ -36,16 +36,13 @@
'''
-import unittest, subprocess
+import unittest
import os
import testlib
import testlib_httpd
import testlib_ssl
import tempfile
-import time
-import shutil
import sys
-import socket
class BasicTest(testlib_httpd.HttpdCommon):
'''Test basic functionality'''
=== modified file 'scripts/test-libxcursor.py'
--- scripts/test-libxcursor.py 2013-06-03 18:50:44 +0000
+++ scripts/test-libxcursor.py 2013-09-11 21:20:40 +0000
@@ -43,7 +43,7 @@
'''
-import unittest, subprocess, sys, os, shutil, tempfile
+import unittest, sys, os, shutil, tempfile
import testlib
try:
=== modified file 'scripts/test-libxfont.py'
--- scripts/test-libxfont.py 2011-08-12 14:38:52 +0000
+++ scripts/test-libxfont.py 2013-09-11 21:20:40 +0000
@@ -37,7 +37,7 @@
'''
-import unittest, subprocess, sys, os, shutil, tempfile
+import unittest, sys, os, shutil, tempfile
import testlib
try:
=== modified file 'scripts/test-libxml2.py'
--- scripts/test-libxml2.py 2013-07-19 15:48:13 +0000
+++ scripts/test-libxml2.py 2013-09-11 21:20:40 +0000
@@ -27,7 +27,7 @@
# QRT-Depends: libxml2 results/libxml2 private/qrt/libxml2.py data
# QRT-Packages: bzip2 libxml2-utils libxml2-dev build-essential python-lxml
-import unittest, subprocess, sys, os, tempfile
+import unittest, sys, os, tempfile
import glob
import shutil
import testlib
=== modified file 'scripts/test-libxslt.py'
--- scripts/test-libxslt.py 2013-03-28 18:20:05 +0000
+++ scripts/test-libxslt.py 2013-09-11 21:20:40 +0000
@@ -40,7 +40,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, glob
+import unittest, sys, os, tempfile, glob
import testlib
try:
=== modified file 'scripts/test-lighttpd.py'
--- scripts/test-lighttpd.py 2010-08-03 18:24:05 +0000
+++ scripts/test-lighttpd.py 2013-09-11 21:20:40 +0000
@@ -42,7 +42,7 @@
# QRT-Packages: lighttpd elinks ssl-cert openssl php5-cgi
# QRT-Privilege: root
-import unittest, subprocess
+import unittest
import os
import testlib
import testlib_httpd
=== modified file 'scripts/test-logrotate.py'
--- scripts/test-logrotate.py 2011-07-21 14:50:28 +0000
+++ scripts/test-logrotate.py 2013-09-11 21:20:40 +0000
@@ -39,7 +39,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, pwd, stat
+import unittest, sys, os, tempfile, pwd, stat
import testlib
try:
=== modified file 'scripts/test-lzma.py'
--- scripts/test-lzma.py 2011-04-21 23:44:59 +0000
+++ scripts/test-lzma.py 2013-09-11 21:20:40 +0000
@@ -29,10 +29,9 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit lsb-release lzma file && ./test-lzma.py -v'
'''
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_compressor
-import tempfile, os, subprocess
+import os
recurse_directory = ""
=== modified file 'scripts/test-mako.py'
--- scripts/test-mako.py 2010-09-28 14:01:41 +0000
+++ scripts/test-mako.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
'''
-import unittest, subprocess, sys, os, tempfile
+import unittest, sys, os, tempfile
import testlib
from mako.template import Template
=== modified file 'scripts/test-mimetex.py'
--- scripts/test-mimetex.py 2010-01-15 01:11:32 +0000
+++ scripts/test-mimetex.py 2013-09-11 21:20:40 +0000
@@ -29,7 +29,7 @@
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
try:
=== modified file 'scripts/test-mono-xsp.py'
--- scripts/test-mono-xsp.py 2012-07-26 17:12:35 +0000
+++ scripts/test-mono-xsp.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
# QRT-Alternates: asp.net2-examples
# QRT-Privilege: root
-import unittest, subprocess, os, sys, urllib, time, socket
+import unittest, os, urllib, time, socket
import testlib
class MonoXSPTest(testlib.TestlibCase):
=== modified file 'scripts/test-moodle.py'
--- scripts/test-moodle.py 2010-01-15 01:11:32 +0000
+++ scripts/test-moodle.py 2013-09-11 21:20:40 +0000
@@ -77,10 +77,10 @@
# QRT-Depends: moodle
-import unittest, subprocess, sys, socket, os, tempfile, hashlib
+import unittest, sys, socket
import testlib, time
-import urllib, urllib2, cookielib, cgi, libxml2, mechanize
-import testlib_dovecot, imaplib
+import urllib, urllib2, cookielib, libxml2, mechanize
+import imaplib
moodle_host = None
email_host = None
=== modified file 'scripts/test-mpfr.py'
--- scripts/test-mpfr.py 2011-11-14 19:56:56 +0000
+++ scripts/test-mpfr.py 2013-09-11 21:20:40 +0000
@@ -28,7 +28,7 @@
# QRT-Packages: lcalc
-import unittest, subprocess, sys
+import unittest, sys
import testlib
use_private = True
=== modified file 'scripts/test-nagios3.py'
--- scripts/test-nagios3.py 2013-01-15 14:00:20 +0000
+++ scripts/test-nagios3.py 2013-09-11 21:20:40 +0000
@@ -44,7 +44,7 @@
- Make sure nagios3 generated initial values before performing tests
'''
-import unittest, subprocess, os, os.path, time, re
+import unittest, subprocess, time, re
import testlib
import sys
=== modified file 'scripts/test-netpbm-free.py'
--- scripts/test-netpbm-free.py 2012-03-09 15:07:04 +0000
+++ scripts/test-netpbm-free.py 2013-09-11 21:20:40 +0000
@@ -29,7 +29,7 @@
# QRT-Depends: data netpbm-free
# QRT-Packages: netpbm
-import unittest, subprocess, sys, os
+import unittest, os
import re
import shutil
import testlib
=== modified file 'scripts/test-nfs-utils.py'
--- scripts/test-nfs-utils.py 2010-01-15 01:11:32 +0000
+++ scripts/test-nfs-utils.py 2013-09-11 21:20:40 +0000
@@ -46,7 +46,7 @@
A lot more nfs testing as this script is pretty basic
'''
-import unittest, subprocess, tempfile, os, os.path, grp, time, socket, sys
+import unittest, subprocess, tempfile, os, os.path, time, socket, sys
import testlib
test_client = ""
=== modified file 'scripts/test-okular.py'
--- scripts/test-okular.py 2012-03-09 15:07:04 +0000
+++ scripts/test-okular.py 2013-09-11 21:20:40 +0000
@@ -31,12 +31,9 @@
# QRT-Depends: testlib_data.py private/qrt/pdfs.py
# QRT-Packages: okular konqueror kdelibs-bin unrar p7zip|p7zip-full unzip texlive-extra-utils
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import testlib_data
-import tempfile
-import os
-import shutil
try:
from private.qrt.pdfs import PrivatePDFTests
=== modified file 'scripts/test-open-iscsi.py'
--- scripts/test-open-iscsi.py 2011-10-20 19:43:06 +0000
+++ scripts/test-open-iscsi.py 2013-09-11 21:20:40 +0000
@@ -43,7 +43,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import time
=== modified file 'scripts/test-openexr.py'
--- scripts/test-openexr.py 2009-09-14 15:56:48 +0000
+++ scripts/test-openexr.py 2013-09-11 21:20:40 +0000
@@ -28,7 +28,7 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit lsb-release openexr && ./test-openexr.py -v'
'''
-import unittest, subprocess, sys, tempfile, os
+import unittest, sys, tempfile, os
import testlib
use_private = True
=== modified file 'scripts/test-openldap.py'
--- scripts/test-openldap.py 2012-01-10 11:19:05 +0000
+++ scripts/test-openldap.py 2013-09-11 21:20:40 +0000
@@ -91,10 +91,10 @@
# QRT-Privilege: root
# QRT-Conflicts: libsasl2-modules-gssapi-heimdal
-import unittest, subprocess, os, sys, shutil, tempfile, time, re, socket
+import unittest, subprocess, os, sys, tempfile, time, re, socket
import testlib
import testlib_ssl
-import os.path, socket
+import os.path
class ServerCommon(testlib.TestlibCase):
'''Common server routines'''
=== modified file 'scripts/test-openoffice.org.py'
--- scripts/test-openoffice.org.py 2012-06-26 03:32:18 +0000
+++ scripts/test-openoffice.org.py 2013-09-11 21:20:40 +0000
@@ -37,8 +37,7 @@
# QRT-Packages: openoffice.org
# QRT-Alternates: libreoffice
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_data
class TestImages(testlib_data.DataCommon):
=== modified file 'scripts/test-openslp.py'
--- scripts/test-openslp.py 2011-04-20 12:52:53 +0000
+++ scripts/test-openslp.py 2013-09-11 21:20:40 +0000
@@ -39,7 +39,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
try:
=== modified file 'scripts/test-openssh.py'
--- scripts/test-openssh.py 2011-01-13 00:34:27 +0000
+++ scripts/test-openssh.py 2013-09-11 21:20:40 +0000
@@ -38,10 +38,9 @@
$ schroot -c lucid -u root -- sh -c 'apt-get -y install python-unit <QRT-Packages> && ./test-PKG.py -v'
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import pexpect
-import time
import shutil
import re
=== modified file 'scripts/test-openssl.py'
--- scripts/test-openssl.py 2013-05-24 01:47:29 +0000
+++ scripts/test-openssl.py 2013-09-11 21:20:40 +0000
@@ -33,7 +33,6 @@
import os
import time
import pexpect
-import signal
import tempfile
import socket
=== modified file 'scripts/test-oprofile.py'
--- scripts/test-oprofile.py 2011-07-07 17:20:41 +0000
+++ scripts/test-oprofile.py 2013-09-11 21:20:40 +0000
@@ -42,7 +42,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import shutil
import tempfile
=== modified file 'scripts/test-pango1.0.py'
--- scripts/test-pango1.0.py 2011-04-26 22:19:39 +0000
+++ scripts/test-pango1.0.py 2013-09-11 21:20:40 +0000
@@ -35,8 +35,7 @@
# QRT-Depends: pango1.0 testlib_data.py
# QRT-Packages: libpango1.0-dev
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_data
use_private = True
=== modified file 'scripts/test-perl.py'
--- scripts/test-perl.py 2013-07-22 15:14:15 +0000
+++ scripts/test-perl.py 2013-09-11 21:20:40 +0000
@@ -30,7 +30,7 @@
# QRT-Depends: data
# Disabled-QRT-Alternates: libarchive-tar-perl
-import unittest, subprocess, sys, os, tempfile, shutil
+import unittest, os, tempfile, shutil
import testlib
class PerlTest(testlib.TestlibCase):
=== modified file 'scripts/test-php5.py'
--- scripts/test-php5.py 2013-09-05 14:59:31 +0000
+++ scripts/test-php5.py 2013-09-11 21:20:40 +0000
@@ -28,17 +28,16 @@
'''
-# QRT-Depends: php5 testlib_httpd.py testlib_ssl.py private/qrt/php5.py data/c0419bt_.pfb data/exif-data.jpg
+# QRT-Depends: php5 testlib_httpd.py private/qrt/php5.py data/c0419bt_.pfb data/exif-data.jpg
# QRT-Packages: php5-cli php5-sqlite php5-gd php5-xmlrpc libapache2-mod-php5 apache2-mpm-prefork elinks php-pear php5-cgi php5-tidy
# Only required on 13.10 and higher
# QRT-Alternates: php5-json
# QRT-Privilege: root
-import unittest, subprocess, shutil, grp, os, os.path, sys, time
+import unittest, subprocess, shutil, os, os.path, sys
import re
import testlib, tempfile
import testlib_httpd
-import testlib_ssl
use_private = True
try:
=== modified file 'scripts/test-poppler.py'
--- scripts/test-poppler.py 2012-01-10 11:25:02 +0000
+++ scripts/test-poppler.py 2013-09-11 21:20:40 +0000
@@ -25,7 +25,7 @@
# QRT-Depends: data private/qrt/poppler.py
# QRT-Packages: poppler-utils
-import unittest, subprocess, sys, tempfile, os
+import unittest, sys, tempfile, os
import testlib
use_private = True
=== modified file 'scripts/test-postfix.py'
--- scripts/test-postfix.py 2012-03-14 14:06:04 +0000
+++ scripts/test-postfix.py 2013-09-11 21:20:40 +0000
@@ -38,7 +38,7 @@
99: restore configs
'''
-import unittest, subprocess, re, pexpect, smtplib, socket, os, time, tempfile
+import unittest, subprocess, pexpect, smtplib, socket, os, time
import testlib
class PostfixTest(testlib.TestlibCase):
=== modified file 'scripts/test-python-crypto.py'
--- scripts/test-python-crypto.py 2012-06-28 13:30:01 +0000
+++ scripts/test-python-crypto.py 2013-09-11 21:20:40 +0000
@@ -35,9 +35,8 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
-import struct
from Crypto.Hash import MD5
from Crypto.PublicKey import ElGamal
from Crypto.PublicKey import RSA
=== modified file 'scripts/test-python-keyring.py'
--- scripts/test-python-keyring.py 2012-11-26 18:23:47 +0000
+++ scripts/test-python-keyring.py 2013-09-11 21:20:40 +0000
@@ -40,7 +40,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
from stat import *
import testlib
import keyring
=== modified file 'scripts/test-python-pam.py'
--- scripts/test-python-pam.py 2012-03-08 16:16:44 +0000
+++ scripts/test-python-pam.py 2013-09-11 21:20:40 +0000
@@ -39,7 +39,7 @@
'''
-import unittest, subprocess, sys, os, PAM
+import unittest, sys, PAM
import testlib
try:
=== modified file 'scripts/test-qemu.py'
--- scripts/test-qemu.py 2013-02-25 04:16:06 +0000
+++ scripts/test-qemu.py 2013-09-11 21:20:40 +0000
@@ -81,7 +81,6 @@
import unittest, subprocess, sys, os
import re
-import shutil
import tempfile
import testlib
import time
=== modified file 'scripts/test-qt4-x11.py'
--- scripts/test-qt4-x11.py 2012-07-11 20:54:06 +0000
+++ scripts/test-qt4-x11.py 2013-09-11 21:20:40 +0000
@@ -26,7 +26,7 @@
schroot -c hardy -- sh -c 'apt-get -y install python-unit PKG && ./test-qt4-x11.py -v'
'''
-import unittest, subprocess, sys
+import unittest, subprocess
import os
import shutil
import testlib
=== modified file 'scripts/test-redhat-cluster.py'
--- scripts/test-redhat-cluster.py 2010-01-15 01:11:32 +0000
+++ scripts/test-redhat-cluster.py 2013-09-11 21:20:40 +0000
@@ -69,12 +69,11 @@
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import testlib_fs
import os
import stat
-import sys
import tempfile
import time
=== modified file 'scripts/test-rpm.py'
--- scripts/test-rpm.py 2013-01-17 19:15:05 +0000
+++ scripts/test-rpm.py 2013-09-11 21:20:40 +0000
@@ -45,7 +45,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
try:
=== modified file 'scripts/test-rsync.py'
--- scripts/test-rsync.py 2011-04-27 14:07:57 +0000
+++ scripts/test-rsync.py 2013-09-11 21:20:40 +0000
@@ -42,7 +42,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import testlib
import testlib_archive
=== modified file 'scripts/test-rsyslog.py'
--- scripts/test-rsyslog.py 2012-03-07 16:01:56 +0000
+++ scripts/test-rsyslog.py 2013-09-11 21:20:40 +0000
@@ -42,7 +42,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import tempfile
import testlib
import socket
=== modified file 'scripts/test-sdl-image1.2.py'
--- scripts/test-sdl-image1.2.py 2012-01-05 19:19:39 +0000
+++ scripts/test-sdl-image1.2.py 2013-09-11 21:20:40 +0000
@@ -25,7 +25,7 @@
# QRT-Depends: data sdl-image1.2
# QRT-Packages: libsdl-image1.2 libsdl-image1.2-dev
-import unittest, subprocess, glob, os.path
+import unittest, glob, os.path
import testlib
class SDLImageTest(testlib.TestlibCase):
=== modified file 'scripts/test-shadow.py'
--- scripts/test-shadow.py 2011-02-15 21:37:58 +0000
+++ scripts/test-shadow.py 2013-09-11 21:20:40 +0000
@@ -28,7 +28,7 @@
all the time.sleep(0.2) are in place)
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import pexpect
import time
=== modified file 'scripts/test-software-properties.py'
--- scripts/test-software-properties.py 2012-10-01 16:01:03 +0000
+++ scripts/test-software-properties.py 2013-09-11 21:20:40 +0000
@@ -42,11 +42,10 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys
import testlib
import threading
from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
-import SocketServer
try:
from private.qrt.SoftwareProperties import PrivateSoftwarePropertiesTest
=== modified file 'scripts/test-squid.py'
--- scripts/test-squid.py 2013-06-14 12:43:00 +0000
+++ scripts/test-squid.py 2013-09-11 21:20:40 +0000
@@ -69,12 +69,11 @@
# QRT-Packages: squid squidclient python-unit elinks netcat pygopherd apparmor-utils
# QRT-Depends: testlib_httpd.py private/qrt/squid.py
-import unittest, subprocess
+import unittest
import os
import sys
import testlib
import testlib_httpd
-import time
try:
from private.qrt.squid import PrivateSquidTest
=== modified file 'scripts/test-subversion.py'
--- scripts/test-subversion.py 2013-06-28 13:52:45 +0000
+++ scripts/test-subversion.py 2013-09-11 21:20:40 +0000
@@ -43,7 +43,6 @@
import testlib
import testlib_httpd
import tempfile
-import shutil
use_private = True
try:
=== modified file 'scripts/test-sudo.py'
--- scripts/test-sudo.py 2012-07-13 01:11:01 +0000
+++ scripts/test-sudo.py 2013-09-11 21:20:40 +0000
@@ -30,7 +30,7 @@
# QRT-Packages: python-pexpect sudo dash build-essential
# QRT-Privilege: root
-import unittest, subprocess, sys, os, re
+import unittest, sys, os, re
import grp
import pexpect
import shutil
=== modified file 'scripts/test-tar.py'
--- scripts/test-tar.py 2010-03-05 03:46:24 +0000
+++ scripts/test-tar.py 2013-09-11 21:20:40 +0000
@@ -30,12 +30,10 @@
# QRT-Depends: testlib_archive.py
# QRT-Packages: tar
-import unittest, subprocess
+import unittest
import testlib
import testlib_archive
import os
-import tempfile
-import time
import sys
class TarTests(testlib_archive.ArchiveCommon):
=== modified file 'scripts/test-tcpdump.py'
--- scripts/test-tcpdump.py 2011-12-19 21:35:42 +0000
+++ scripts/test-tcpdump.py 2013-09-11 21:20:40 +0000
@@ -24,7 +24,7 @@
schroot -c hardy -u root -- sh -c 'apt-get -y install python-unit && ./test-tcpdump.py [<interface>]'
'''
-import unittest, subprocess, sys
+import unittest, sys
import testlib
import glob
import os
=== modified file 'scripts/test-tiff.py'
--- scripts/test-tiff.py 2012-11-14 20:12:53 +0000
+++ scripts/test-tiff.py 2013-09-11 21:20:40 +0000
@@ -31,7 +31,7 @@
'''
-import unittest, subprocess, sys, tempfile, re, os
+import unittest, subprocess, sys, tempfile, os
import testlib
try:
=== modified file 'scripts/test-tk.py'
--- scripts/test-tk.py 2012-03-09 15:07:04 +0000
+++ scripts/test-tk.py 2013-09-11 21:20:40 +0000
@@ -29,7 +29,7 @@
# QRT-Alternates: tk8.3
-import unittest, subprocess, sys, os
+import unittest, os
import testlib
class TkTest(testlib.TestlibCase):
=== modified file 'scripts/test-usbmuxd.py'
--- scripts/test-usbmuxd.py 2012-02-03 16:35:21 +0000
+++ scripts/test-usbmuxd.py 2013-09-11 21:20:40 +0000
@@ -38,7 +38,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import pwd
import re
import testlib
=== modified file 'scripts/test-vsftpd.py'
--- scripts/test-vsftpd.py 2011-12-06 18:33:21 +0000
+++ scripts/test-vsftpd.py 2013-09-11 21:20:40 +0000
@@ -41,7 +41,7 @@
'''
-import unittest, subprocess, sys, os, tempfile, socket, time
+import unittest, sys, os, tempfile, socket, time
import testlib
try:
=== modified file 'scripts/test-vte.py'
--- scripts/test-vte.py 2010-07-15 17:31:32 +0000
+++ scripts/test-vte.py 2013-09-11 21:20:40 +0000
@@ -37,7 +37,7 @@
'''
-import unittest, subprocess, sys, os, time
+import unittest, sys, time
import testlib
import select
import tty
=== modified file 'scripts/test-w3m.py'
--- scripts/test-w3m.py 2012-02-09 20:11:52 +0000
+++ scripts/test-w3m.py 2013-09-11 21:20:40 +0000
@@ -32,12 +32,11 @@
# QRT-Packages: w3m apache2-mpm-prefork ssl-cert openssl ca-certificates lsb-release python-pexpect
# QRT-Privilege: root
-import unittest, subprocess, sys, os, shutil, time
+import unittest, sys, os, shutil, time
import testlib
import testlib_httpd
import testlib_ssl
import tempfile
-import time
import pexpect
class TestURLs(testlib_httpd.HttpdCommon):
=== modified file 'scripts/test-wget.py'
--- scripts/test-wget.py 2012-02-09 20:11:52 +0000
+++ scripts/test-wget.py 2013-09-11 21:20:40 +0000
@@ -37,10 +37,7 @@
import testlib_httpd
import testlib_ssl
import tempfile
-import time
-import shutil
import sys
-import socket
class BasicTest(testlib_httpd.HttpdCommon):
'''Test basic functionality'''
=== modified file 'scripts/test-xine.py'
--- scripts/test-xine.py 2010-01-11 22:25:43 +0000
+++ scripts/test-xine.py 2013-09-11 21:20:40 +0000
@@ -62,8 +62,7 @@
# QRT-Depends: testlib_multimedia.py
-import unittest, subprocess, sys
-import testlib
+import unittest, sys
import testlib_multimedia
class TestPlayback(testlib_multimedia.MultimediaCommon):
=== modified file 'scripts/test-xmlrpc-c.py'
--- scripts/test-xmlrpc-c.py 2010-02-18 20:17:44 +0000
+++ scripts/test-xmlrpc-c.py 2013-09-11 21:20:40 +0000
@@ -33,7 +33,7 @@
'''
-import unittest, subprocess, sys
+import unittest
import testlib
class XmlRPCCTest(testlib.TestlibCase):
=== modified file 'scripts/test-xulrunner-1.9.2.py'
--- scripts/test-xulrunner-1.9.2.py 2012-02-17 22:36:49 +0000
+++ scripts/test-xulrunner-1.9.2.py 2013-09-11 21:20:40 +0000
@@ -38,7 +38,7 @@
'''
-import unittest, subprocess, sys, os
+import unittest, sys, os
import glob
import testlib
=== modified file 'scripts/testlib.py'
--- scripts/testlib.py 2013-08-28 21:02:15 +0000
+++ scripts/testlib.py 2013-09-11 21:20:40 +0000
@@ -19,10 +19,9 @@
'''Common classes and functions for package tests.'''
-import string, random, crypt, subprocess, pwd, grp, signal, time, unittest, tempfile, shutil, os, os.path, re, glob
+import string, random, crypt, subprocess, pwd, grp, time, unittest, tempfile, shutil, os, os.path, re, glob
import sys, socket, gzip
from stat import *
-from encodings import string_escape
import warnings
warnings.filterwarnings('ignore', message=r'.*apt_pkg\.TagFile.*', category=DeprecationWarning)
=== modified file 'scripts/testlib_archive.py'
--- scripts/testlib_archive.py 2011-11-08 20:05:39 +0000
+++ scripts/testlib_archive.py 2013-09-11 21:20:40 +0000
@@ -45,7 +45,6 @@
sys.exit(1)
'''
-import unittest
import testlib
import os
import tempfile
=== modified file 'scripts/testlib_compressor.py'
--- scripts/testlib_compressor.py 2011-10-05 21:14:09 +0000
+++ scripts/testlib_compressor.py 2013-09-11 21:20:40 +0000
@@ -51,7 +51,6 @@
sys.exit(1)
'''
-import unittest
import testlib
import os
from stat import *
=== modified file 'scripts/testlib_data.py'
--- scripts/testlib_data.py 2012-01-17 22:07:06 +0000
+++ scripts/testlib_data.py 2013-09-11 21:20:40 +0000
@@ -52,7 +52,6 @@
# QRT-Depends: data
-import unittest
import os
import sys
import tempfile
=== modified file 'scripts/testlib_dns.py'
--- scripts/testlib_dns.py 2012-09-13 13:19:15 +0000
+++ scripts/testlib_dns.py 2013-09-11 21:20:40 +0000
@@ -18,8 +18,6 @@
#
import adns
-import unittest, subprocess
-import os
import sys
import testlib
import testlib_dns
@@ -27,7 +25,7 @@
class DnsCommon(testlib.TestlibCase):
'''Common functions'''
- def _setUp(self, namesever="127.0.0.1"):
+ def _setUp(self, nameserver="127.0.0.1"):
'''Setup'''
self.daemon.stop()
self.release = testlib.ubuntu_release()
=== modified file 'scripts/testlib_dovecot.py'
--- scripts/testlib_dovecot.py 2013-03-25 18:29:15 +0000
+++ scripts/testlib_dovecot.py 2013-09-11 21:20:40 +0000
@@ -27,7 +27,7 @@
Packages required: dovecot-imapd dovecot-pop3d
'''
-import subprocess, shutil, grp, os, os.path, sys, time
+import subprocess, shutil, grp, os, os.path, time
import testlib
class Dovecot:
=== modified file 'scripts/testlib_fs.py'
--- scripts/testlib_fs.py 2009-12-18 03:14:38 +0000
+++ scripts/testlib_fs.py 2013-09-11 21:20:40 +0000
@@ -28,7 +28,6 @@
- lots more
'''
-import unittest, subprocess
import os
import stat
import sys
=== modified file 'scripts/testlib_httpd.py'
--- scripts/testlib_httpd.py 2013-07-26 15:52:48 +0000
+++ scripts/testlib_httpd.py 2013-09-11 21:20:40 +0000
@@ -18,10 +18,9 @@
# along with this program. If not, see <httpd://www.gnu.org/licenses/>.
#
-import unittest, subprocess
+import subprocess
import os
import sys
-import tempfile
import testlib
import time
import socket
=== modified file 'scripts/testlib_multimedia.py'
--- scripts/testlib_multimedia.py 2012-02-16 18:19:58 +0000
+++ scripts/testlib_multimedia.py 2013-09-11 21:20:40 +0000
@@ -19,9 +19,8 @@
# QRT-Depends: testlib_multimedia
-import unittest, subprocess
+import subprocess
import os
-import re
import sys
import tempfile
import testlib
=== modified file 'scripts/usbmuxd/usbmux.py'
--- scripts/usbmuxd/usbmux.py 2012-02-03 16:35:21 +0000
+++ scripts/usbmuxd/usbmux.py 2013-09-11 21:20:40 +0000
@@ -94,7 +94,7 @@
devid = struct.unpack("I", payload)[0]
return {'DeviceID': devid}
else:
- raise MuxError("Invalid incoming request type %d"%req)
+ raise MuxError("Invalid incoming request type %d"%resp)
def sendpacket(self, req, tag, payload={}):
payload = self._pack(req, payload)
@@ -238,7 +238,6 @@
return connector.connect(device, port)
if __name__ == "__main__":
- import time
mux = USBMux()
print "Waiting for devices..."
if not mux.devices:
Follow ups
