From patchwork Wed Jul 6 22:42:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 2513 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 867A324130 for ; Wed, 6 Jul 2011 22:42:32 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4F1ECA186E0 for ; Wed, 6 Jul 2011 22:42:32 +0000 (UTC) Received: by qwb8 with SMTP id 8so278837qwb.11 for ; Wed, 06 Jul 2011 15:42:31 -0700 (PDT) Received: by 10.229.102.98 with SMTP id f34mr106540qco.42.1309992151676; Wed, 06 Jul 2011 15:42:31 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.48.135 with SMTP id r7cs92377qcf; Wed, 6 Jul 2011 15:42:30 -0700 (PDT) Received: by 10.216.235.133 with SMTP id u5mr5792337weq.101.1309992149942; Wed, 06 Jul 2011 15:42:29 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id w18si17604237weq.62.2011.07.06.15.42.29; Wed, 06 Jul 2011 15:42:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Qeand-0007U3-9i for ; Wed, 06 Jul 2011 22:42:29 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 436362E84F6 for ; Wed, 6 Jul 2011 22:42:29 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 12 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 12: use ubertestcase Message-Id: <20110706224229.3582.5138.launchpad@loganberry.canonical.com> Date: Wed, 06 Jul 2011 22:42:29 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13376"; Instance="initZopeless config overlay" X-Launchpad-Hash: 611455dab970530244d5ce5acd1dc106c540c7a8 ------------------------------------------------------------ revno: 12 committer: Michael-Doyle Hudson branch nick: trunk timestamp: Thu 2011-07-07 10:26:43 +1200 message: use ubertestcase modified: lava_scheduler_app/tests.py setup.py --- lp:lava-scheduler https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk You are subscribed to branch lp:lava-scheduler. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription === modified file 'lava_scheduler_app/tests.py' --- lava_scheduler_app/tests.py 2011-06-23 04:08:49 +0000 +++ lava_scheduler_app/tests.py 2011-07-06 22:26:43 +0000 @@ -1,20 +1,19 @@ +import cStringIO import datetime import json import xmlrpclib from django.contrib.auth.models import Permission, User -from django.test import TestCase +from django.test.client import Client + +from django_testscenarios.ubertest import TestCase from lava_scheduler_app.models import Device, DeviceType, TestJob -import cStringIO - -from xmlrpclib import ServerProxy, Transport - -from django.test.client import Client + # Based on http://www.technobabble.dk/2008/apr/02/xml-rpc-dispatching-through-django-test-client/ -class TestTransport(Transport): +class TestTransport(xmlrpclib.Transport): """Handles connections to XML-RPC server through Django test client.""" def __init__(self, user=None, password=None): @@ -138,7 +137,7 @@ class TestSchedulerAPI(TestCaseWithFactory): def server_proxy(self, user=None, password=None): - return ServerProxy( + return xmlrpclib.ServerProxy( 'http://localhost/RPC2/', transport=TestTransport(user=user, password=password)) === modified file 'setup.py' --- setup.py 2011-07-06 22:00:53 +0000 +++ setup.py 2011-07-06 22:26:43 +0000 @@ -38,6 +38,10 @@ "twisted", ], setup_requires=[ - "versiontools >= 1.3.1"], + "versiontools >= 1.3.1", + ], + test_requires=[ + "django-testscenarios", + ], zip_safe=False, include_package_data=True)