From 90e9fe28afdda32985a630f431e5cd275ff3fdaa Mon Sep 17 00:00:00 2001 From: david-sarah Date: Wed, 2 Jun 2010 22:46:08 -0700 Subject: [PATCH] Resolve conflict in patch to change imports to absolute. --- src/allmydata/test/test_upload.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py index 6f4ff374..52e5aede 100644 --- a/src/allmydata/test/test_upload.py +++ b/src/allmydata/test/test_upload.py @@ -13,8 +13,10 @@ from allmydata.immutable import upload, encode from allmydata.interfaces import FileTooLargeError, UploadUnhappinessError from allmydata.util.assertutil import precondition from allmydata.util.deferredutil import DeferredListShouldSucceed -from no_network import GridTestMixin -from common_util import ShouldFailMixin +from allmydata.test.no_network import GridTestMixin +from allmydata.test.common_util import ShouldFailMixin +from allmydata.util.happinessutil import servers_of_happiness, \ + shares_by_server, merge_peers from allmydata.storage_client import StorageFarmBroker from allmydata.storage.server import storage_index_to_dir -- 2.45.2