From 5a307d11470bc7545903ca736f769582e509c438 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sun, 1 Jul 2012 12:03:55 +0100 Subject: [PATCH] In unit-tests, always use StringIO, not io Some versions of Python 2.6 seem to have problems with io's version. --- tests/basetest.py | 8 ++++++-- tests/testalias.py | 3 +-- tests/testdistro.py | 2 -- tests/testdownload.py | 13 ++++--------- tests/testdriver.py | 6 +----- tests/testinstall.py | 9 ++------- tests/testlaunch.py | 8 +------- tests/testpackagekit.py | 2 +- tests/testrun.py | 3 +-- tests/testschedular.py | 2 +- tests/teststore.py | 6 +----- 11 files changed, 19 insertions(+), 43 deletions(-) diff --git a/tests/basetest.py b/tests/basetest.py index fdd9c3c..f90baaf 100755 --- a/tests/basetest.py +++ b/tests/basetest.py @@ -4,7 +4,11 @@ import unittest import logging import warnings from xml.dom import minidom -from io import BytesIO +if sys.version_info[0] > 2: + from io import StringIO, BytesIO +else: + from StringIO import StringIO + BytesIO = StringIO warnings.filterwarnings("ignore", message = 'The CObject type') # Catch silly mistakes... @@ -16,7 +20,7 @@ from zeroinstall.injector import qdom from zeroinstall.injector import iface_cache, download, distro, model, handler, policy, reader, trust from zeroinstall.zerostore import NotStored, Store, Stores; Store._add_with_helper = lambda *unused: False from zeroinstall import support, apps -from zeroinstall.support import basedir, tasks, basestring +from zeroinstall.support import basedir, tasks dpkgdir = os.path.join(os.path.dirname(__file__), 'dpkg') diff --git a/tests/testalias.py b/tests/testalias.py index 15dc99e..9d7b982 100755 --- a/tests/testalias.py +++ b/tests/testalias.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from basetest import BaseTest +from basetest import BaseTest, StringIO import sys, tempfile -from io import StringIO import unittest sys.path.insert(0, '..') diff --git a/tests/testdistro.py b/tests/testdistro.py index bc8bcb1..88da96a 100755 --- a/tests/testdistro.py +++ b/tests/testdistro.py @@ -266,8 +266,6 @@ class TestDistro(BaseTest): os.path.join(dpkgdir, 'status')) host._packagekit = DummyPackageKit() - factory = self.make_factory(host) - master_feed = parse_impls("""""") icache = iface_cache.IfaceCache(distro = host) icache._feeds[master_feed.url] = master_feed diff --git a/tests/testdownload.py b/tests/testdownload.py index 87a8d89..ddaff4e 100755 --- a/tests/testdownload.py +++ b/tests/testdownload.py @@ -1,13 +1,8 @@ #!/usr/bin/env python from __future__ import with_statement -from basetest import BaseTest -import warnings +from basetest import BaseTest, StringIO import sys, tempfile, os -if sys.version_info[0] > 2: - from io import StringIO -else: - from StringIO import StringIO -import unittest, signal +import unittest from logging import getLogger, WARN, ERROR from contextlib import contextmanager @@ -444,7 +439,6 @@ class TestDownload(BaseTest): trust.trust_db.trust_key('DE937DD411906ACF7C263B396FCF121BE2390E0B', 'example.com:8000') run_server(server.Give404('/Hello.xml'), 'latest.xml', '/0mirror/keys/6FCF121BE2390E0B.gpg', 'Hello.xml') - driver = Driver(requirements = Requirements('http://example.com:8000/Hello.xml'), config = self.config) self.config.feed_mirror = 'http://example.com:8000/0mirror' # Update from mirror (should ignore out-of-date timestamp) @@ -532,6 +526,7 @@ class TestDownload(BaseTest): selections_path = os.path.join(app.path, 'selections.xml') def reset_timestamps(): + global ran_gui ran_gui = False os.utime(timestamp, (1, 1)) # 1970 os.utime(selections_path, (1, 1)) @@ -607,7 +602,7 @@ class TestDownload(BaseTest): with trapped_exit(1): dl = app.download_selections(sels) assert dl == None - assert ran_gui # (so doesn't actually update) + assert not ran_gui # (so doesn't actually update) self.assertNotEqual(1, os.stat(timestamp).st_mtime) self.assertNotEqual(1, os.stat(selections_path).st_mtime) diff --git a/tests/testdriver.py b/tests/testdriver.py index 549b55d..2b34caf 100755 --- a/tests/testdriver.py +++ b/tests/testdriver.py @@ -1,10 +1,6 @@ #!/usr/bin/env python -from basetest import BaseTest +from basetest import BaseTest, StringIO import sys, tempfile, os, logging -if sys.version_info[0] > 2: - from io import StringIO -else: - from StringIO import StringIO import unittest sys.path.insert(0, '..') diff --git a/tests/testinstall.py b/tests/testinstall.py index 8b8bb46..436eee3 100755 --- a/tests/testinstall.py +++ b/tests/testinstall.py @@ -1,16 +1,11 @@ #!/usr/bin/env python -from basetest import BaseTest, TestStores +from basetest import BaseTest, TestStores, StringIO, BytesIO import sys, os, tempfile -if sys.version_info[0] > 2: - from io import StringIO, BytesIO -else: - from StringIO import StringIO - BytesIO = StringIO import unittest sys.path.insert(0, '..') from zeroinstall import cmd -from zeroinstall.injector import model, selections, qdom, reader, handler, gpg, config +from zeroinstall.injector import model, selections, qdom, handler, gpg, config mydir = os.path.dirname(__file__) diff --git a/tests/testlaunch.py b/tests/testlaunch.py index af3adde..58205fa 100755 --- a/tests/testlaunch.py +++ b/tests/testlaunch.py @@ -2,17 +2,11 @@ from __future__ import print_function -from basetest import BaseTest +from basetest import BaseTest, StringIO, BytesIO import sys, tempfile, os import unittest import logging -if sys.version_info[0] > 2: - from io import StringIO, BytesIO -else: - from StringIO import StringIO - BytesIO = StringIO - foo_iface_uri = 'http://foo' sys.path.insert(0, '..') diff --git a/tests/testpackagekit.py b/tests/testpackagekit.py index 7976d8c..ff9d36e 100755 --- a/tests/testpackagekit.py +++ b/tests/testpackagekit.py @@ -4,7 +4,7 @@ import sys, imp import unittest sys.path.insert(0, '..') -from zeroinstall.injector import packagekit, handler, model, fetch +from zeroinstall.injector import packagekit, model, fetch from zeroinstall.support import tasks import dbus diff --git a/tests/testrun.py b/tests/testrun.py index 4ca6688..c524f0d 100755 --- a/tests/testrun.py +++ b/tests/testrun.py @@ -1,8 +1,7 @@ #!/usr/bin/env python -from basetest import BaseTest +from basetest import BaseTest, StringIO import os, sys, subprocess import unittest -from io import StringIO sys.path.insert(0, '..') diff --git a/tests/testschedular.py b/tests/testschedular.py index 4224abd..ac9deef 100755 --- a/tests/testschedular.py +++ b/tests/testschedular.py @@ -43,7 +43,7 @@ class TestSchedular(BaseTest): yield resume try: tasks.check(resume) - except Exception as ex: + except Exception: step.status = "fail" else: step.status = "ok" diff --git a/tests/teststore.py b/tests/teststore.py index 0332f28..de40262 100755 --- a/tests/teststore.py +++ b/tests/teststore.py @@ -1,10 +1,6 @@ #!/usr/bin/env python -from basetest import BaseTest +from basetest import BaseTest, StringIO import sys, tempfile, os -if sys.version_info[0] > 2: - from io import StringIO -else: - from StringIO import StringIO import unittest import logging -- 2.11.4.GIT