Rev 6514: Fix failing tests and remove the now useless info.py. in file:///home/vila/src/bzr/experimental/webdav/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/webdav/

------------------------------------------------------------
revno: 6514
revision-id: v.ladeuil+lp at free.fr-20120326165048-v0q9a1wa739qvp3u
parent: v.ladeuil+lp at free.fr-20120326154839-qayoxyq15vyhnge0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: webdav
timestamp: Mon 2012-03-26 18:50:48 +0200
message:
  Fix failing tests and remove the now useless info.py.
-------------- next part --------------
=== removed file 'bzrlib/plugins/webdav/info.py'
--- a/bzrlib/plugins/webdav/info.py	2012-03-26 15:31:31 +0000
+++ b/bzrlib/plugins/webdav/info.py	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-# Copyright (C) 2011 by Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-bzr_plugin_name = 'webdav'
-
-# versions ending in 'dev' mean development version
-# versions ending in 'final' mean release (well tested, etc)
-bzr_plugin_version = (2, 5, 0, 'final', 0)
-
-bzr_compatible_versions = [(2, x, 0) for x in [5, 6,]]
-
-bzr_minimum_version = bzr_compatible_versions[0]
-
-bzr_maximum_version = bzr_compatible_versions[-1]
-

=== modified file 'bzrlib/plugins/webdav/webdav.py'
--- a/bzrlib/plugins/webdav/webdav.py	2012-03-26 15:31:31 +0000
+++ b/bzrlib/plugins/webdav/webdav.py	2012-03-26 16:50:48 +0000
@@ -21,6 +21,7 @@
 This should enable remote push operations.
 """
 
+from __future__ import absolute_import
 from cStringIO import StringIO
 import os
 import random
@@ -868,5 +869,5 @@
 
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    import tests.dav_server
-    return [(HttpDavTransport, tests.dav_server.DAVServer),]
+    from bzrlib.plugins.webdav.tests import dav_server
+    return [(HttpDavTransport, dav_server.DAVServer),]