From: david-sarah <david-sarah@jacaranda.org>
Date: Thu, 3 Jun 2010 05:46:08 +0000 (-0700)
Subject: Resolve conflict in patch to change imports to absolute.
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/class-simplejson.JSONDecoder.html?a=commitdiff_plain;h=90e9fe28afdda32985a630f431e5cd275ff3fdaa;p=tahoe-lafs%2Ftahoe-lafs.git

Resolve conflict in patch to change imports to absolute.
---

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