From c0e766e92876d5e002cb41d38fa310477f0357a7 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 16 Jan 2011 14:22:29 +0000
Subject: [PATCH] Tests pass without get_deprecated_singleton_config

---
 tests/basetest.py                   |  7 ++++++-
 tests/testdownload.py               | 14 +++++++-------
 tests/testpolicy.py                 |  6 +++---
 tests/testreader.py                 | 10 +++++-----
 tests/testsat.py                    | 10 +++++-----
 tests/testselections.py             |  6 +++---
 tests/testsolver.py                 | 23 ++++++++++++-----------
 zeroinstall/cmd/select.py           |  2 +-
 zeroinstall/injector/background.py  |  6 +++---
 zeroinstall/injector/iface_cache.py |  7 ++-----
 zeroinstall/injector/policy.py      |  7 ++++---
 zeroinstall/injector/reader.py      |  5 +----
 zeroinstall/injector/selections.py  | 14 ++++++++------
 13 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/tests/basetest.py b/tests/basetest.py
index e5e1af9..0e52025 100755
--- a/tests/basetest.py
+++ b/tests/basetest.py
@@ -11,7 +11,7 @@ os.environ['LANGUAGE'] = 'C'
 
 sys.path.insert(0, '..')
 from zeroinstall.injector import qdom
-from zeroinstall.injector import iface_cache, download, distro, model, handler, policy
+from zeroinstall.injector import iface_cache, download, distro, model, handler, policy, reader
 from zeroinstall.zerostore import Store, Stores; Store._add_with_helper = lambda *unused: False
 from zeroinstall import support, helpers
 from zeroinstall.support import basedir
@@ -141,3 +141,8 @@ class BaseTest(unittest.TestCase):
 		shutil.rmtree(self.gnupg_home)
 
 		os.environ['PATH'] = self.old_path
+
+	def import_feed(self, url, path):
+		iface_cache = self.config.iface_cache
+		iface_cache.get_interface(url)
+		iface_cache._feeds[url] = reader.load_feed(path)
diff --git a/tests/testdownload.py b/tests/testdownload.py
index 22e3ab5..43e7d4a 100755
--- a/tests/testdownload.py
+++ b/tests/testdownload.py
@@ -11,7 +11,7 @@ sys.path.insert(0, '..')
 
 os.environ["http_proxy"] = "localhost:8000"
 
-from zeroinstall.injector import model, gpg, iface_cache, download, reader, trust, handler, background, arch, selections, qdom, run
+from zeroinstall.injector import model, gpg, iface_cache, download, trust, handler, background, arch, selections, qdom, run
 from zeroinstall.injector.policy import Policy
 from zeroinstall.zerostore import Store, NotStored; Store._add_with_helper = lambda *unused: False
 from zeroinstall.support import basedir, tasks
@@ -167,10 +167,10 @@ class TestDownload(BaseTest):
 			except NotStored:
 				pass
 			cli.main(['--download-only', 'selections.xml'])
-			path = self.config.iface_cache.stores.lookup_any(sels.selections['http://example.com:8000/Hello.xml'].digests)
+			path = self.config.stores.lookup_any(sels.selections['http://example.com:8000/Hello.xml'].digests)
 			assert os.path.exists(os.path.join(path, 'HelloWorld', 'main'))
 
-			assert sels.download_missing(self.config.iface_cache, None) is None
+			assert sels.download_missing(self.config) is None
 
 	def testHelpers(self):
 		from zeroinstall import helpers
@@ -181,7 +181,7 @@ class TestDownload(BaseTest):
 			sels = helpers.ensure_cached('http://example.com:8000/Hello.xml')
 			path = self.config.stores.lookup_any(sels.selections['http://example.com:8000/Hello.xml'].digests)
 			assert os.path.exists(os.path.join(path, 'HelloWorld', 'main'))
-			assert sels.download_missing(self.config.iface_cache, None) is None
+			assert sels.download_missing(self.config) is None
 
 	def testSelectionsWithFeed(self):
 		from zeroinstall.injector import cli
@@ -198,7 +198,7 @@ class TestDownload(BaseTest):
 			path = self.config.stores.lookup_any(sels.selections['http://example.com:8000/Hello.xml'].digests)
 			assert os.path.exists(os.path.join(path, 'HelloWorld', 'main'))
 
-			assert sels.download_missing(self.config.iface_cache, None) is None
+			assert sels.download_missing(self.config) is None
 	
 	def testAcceptKey(self):
 		with output_suppressed():
@@ -364,11 +364,11 @@ class TestDownload(BaseTest):
 
 	def testBackground(self, verbose = False):
 		p = Policy('http://example.com:8000/Hello.xml', config = self.config)
-		reader.update(p.config.iface_cache.get_interface(p.root), 'Hello.xml')
+		self.import_feed(p.root, 'Hello.xml')
 		p.freshness = 0
 		p.network_use = model.network_minimal
 		p.solver.solve(p.root, arch.get_host_architecture())
-		assert p.ready
+		assert p.ready, p.solver.get_failure_reason()
 
 		@tasks.async
 		def choose_download(registed_cb, nid, actions):
diff --git a/tests/testpolicy.py b/tests/testpolicy.py
index 7d1a52d..2f0e08a 100755
--- a/tests/testpolicy.py
+++ b/tests/testpolicy.py
@@ -18,11 +18,11 @@ class TestPolicy(BaseTest):
 		warnings.filterwarnings("ignore", category = DeprecationWarning)
 
 		foo = iface_cache.get_interface('http://foo/Binary.xml')
-		reader.update(foo, 'Binary.xml')
+		self.import_feed(foo.uri, 'Binary.xml')
 		foo_src = iface_cache.get_interface('http://foo/Source.xml')
-		reader.update(foo_src, 'Source.xml')
+		self.import_feed(foo_src.uri, 'Source.xml')
 		compiler = iface_cache.get_interface('http://foo/Compiler.xml')
-		reader.update(compiler, 'Compiler.xml')
+		self.import_feed(compiler.uri, 'Compiler.xml')
 
 		p = Policy('http://foo/Binary.xml', config = self.config)
 		p.freshness = 0
diff --git a/tests/testreader.py b/tests/testreader.py
index 19e9079..30dc77c 100755
--- a/tests/testreader.py
+++ b/tests/testreader.py
@@ -72,7 +72,7 @@ class TestReader(BaseTest):
 </interface>""" % (foo_iface_uri, bar_iface_uri, bar_iface_uri))
 		tmp.flush()
 		iface = model.Interface(foo_iface_uri)
-		reader.update(iface, tmp.name)
+		reader.update(iface, tmp.name, iface_cache = self.config.iface_cache)
 		feed = self.config.iface_cache.get_feed(foo_iface_uri)
 
 		impl = feed.implementations['sha1=123']
@@ -112,7 +112,7 @@ class TestReader(BaseTest):
 </interface>""")
 		tmp.flush()
 		iface = model.Interface(foo_iface_uri)
-		reader.update(iface, tmp.name, local = True)
+		reader.update(iface, tmp.name, local = True, iface_cache = self.config.iface_cache)
 
 		feed = self.config.iface_cache.get_feed(foo_iface_uri)
 
@@ -150,7 +150,7 @@ class TestReader(BaseTest):
 </interface>""" % foo_iface_uri)
 		tmp.flush()
 		iface = model.Interface(foo_iface_uri)
-		reader.update(iface, tmp.name)
+		reader.update(iface, tmp.name, iface_cache = self.config.iface_cache)
 		feed = self.config.iface_cache.get_feed(foo_iface_uri)
 		impl = feed.implementations['sha1=123']
 		assert impl.version == [[1, 0], -1, [3], -2]
@@ -173,7 +173,7 @@ class TestReader(BaseTest):
 </interface>""" % foo_iface_uri)
 		tmp.flush()
 		iface = model.Interface(foo_iface_uri)
-		reader.update(iface, tmp.name)
+		reader.update(iface, tmp.name, iface_cache = self.config.iface_cache)
 
 		feed = iface_cache.get_feed(foo_iface_uri)
 
@@ -201,7 +201,7 @@ class TestReader(BaseTest):
 		tmp.flush()
 
 		iface = model.Interface(foo_iface_uri)
-		reader.update(iface, tmp.name, True)
+		reader.update(iface, tmp.name, True, iface_cache = self.config.iface_cache)
 
 		master_feed = iface_cache.get_feed(foo_iface_uri)
 		assert len(master_feed.implementations) == 0
diff --git a/tests/testsat.py b/tests/testsat.py
index f1fff36..a0f600a 100755
--- a/tests/testsat.py
+++ b/tests/testsat.py
@@ -147,8 +147,8 @@ def assertSelection(expected, repo):
 		assert s.ready
 
 		actual = []
-		for iface, impl in s.selections.iteritems():
-			actual.append(((iface.uri.rsplit('/', 1)[1]), impl.get_version()))
+		for iface_uri, impl in s.selections.selections.iteritems():
+			actual.append(((iface_uri.rsplit('/', 1)[1]), impl.version))
 
 		expected.sort()
 		actual.sort()
@@ -287,9 +287,9 @@ class TestSAT(BaseTest):
 			""")
 		assert not s.ready
 		selected = {}
-		for iface, impl in s.selections.iteritems():
-			if impl is not None: impl = impl.get_version()
-			selected[iface.uri.rsplit('/', 1)[1]] = impl
+		for iface_uri, impl in s.selections.selections.iteritems():
+			if impl is not None: impl = impl.version
+			selected[iface_uri.rsplit('/', 1)[1]] = impl
 		self.assertEquals({
 			'prog': '2',
 			'liba': '2',
diff --git a/tests/testselections.py b/tests/testselections.py
index 38e2020..161d3ff 100755
--- a/tests/testselections.py
+++ b/tests/testselections.py
@@ -5,7 +5,7 @@ import sys, os
 import unittest
 
 sys.path.insert(0, '..')
-from zeroinstall.injector import selections, model, reader, policy, namespaces, qdom
+from zeroinstall.injector import selections, model, policy, namespaces, qdom
 
 mydir = os.path.dirname(os.path.abspath(__file__))
 
@@ -14,8 +14,8 @@ class TestSelections(BaseTest):
 		p = policy.Policy('http://foo/Source.xml', src = True, config = self.config)
 		source = self.config.iface_cache.get_interface('http://foo/Source.xml')
 		compiler = self.config.iface_cache.get_interface('http://foo/Compiler.xml')
-		reader.update(source, 'Source.xml')
-		reader.update(compiler, 'Compiler.xml')
+		self.import_feed(source.uri, 'Source.xml')
+		self.import_feed(compiler.uri, 'Compiler.xml')
 
 		p.freshness = 0
 		p.network_use = model.network_full
diff --git a/tests/testsolver.py b/tests/testsolver.py
index ac515f7..36f09e2 100755
--- a/tests/testsolver.py
+++ b/tests/testsolver.py
@@ -18,11 +18,11 @@ class TestSolver(BaseTest):
 		s = solver.DefaultSolver(self.config)
 
 		foo = iface_cache.get_interface('http://foo/Binary.xml')
-		reader.update(foo, 'Binary.xml')
+		self.import_feed(foo.uri, 'Binary.xml')
 		foo_src = iface_cache.get_interface('http://foo/Source.xml')
-		reader.update(foo_src, 'Source.xml')
+		self.import_feed(foo_src.uri, 'Source.xml')
 		compiler = iface_cache.get_interface('http://foo/Compiler.xml')
-		reader.update(compiler, 'Compiler.xml')
+		self.import_feed(compiler.uri, 'Compiler.xml')
 
 		binary_arch = arch.Architecture({None: 1}, {None: 1})
 		assert str(binary_arch).startswith("<Arch")
@@ -47,12 +47,13 @@ class TestSolver(BaseTest):
 		iface_cache = self.config.iface_cache
 		s = solver.DefaultSolver(self.config)
 
-		foo = iface_cache.get_interface('http://foo/Binary.xml')
-		reader.update(foo, 'Binary.xml')
+		foo_binary_uri = 'http://foo/Binary.xml'
+		foo = iface_cache.get_interface(foo_binary_uri)
+		self.import_feed(foo_binary_uri, 'Binary.xml')
 		foo_src = iface_cache.get_interface('http://foo/Source.xml')
-		reader.update(foo_src, 'Source.xml')
+		self.import_feed(foo_src.uri, 'Source.xml')
 		compiler = iface_cache.get_interface('http://foo/Compiler.xml')
-		reader.update(compiler, 'Compiler.xml')
+		self.import_feed(compiler.uri, 'Compiler.xml')
 
 		binary_arch = arch.Architecture({None: 1}, {None: 1})
 		s.record_details = True
@@ -74,7 +75,7 @@ class TestSolver(BaseTest):
 		s = solver.DefaultSolver(self.config)
 
 		foo = iface_cache.get_interface('http://foo/Recursive.xml')
-		reader.update(foo, 'Recursive.xml')
+		self.import_feed(foo.uri, 'Recursive.xml')
 
 		binary_arch = arch.Architecture({None: 1}, {None: 1})
 		s.record_details = True
@@ -91,9 +92,9 @@ class TestSolver(BaseTest):
 		s = solver.DefaultSolver(self.config)
 
 		foo = iface_cache.get_interface('http://foo/MultiArch.xml')
-		reader.update(foo, 'MultiArch.xml')
+		self.import_feed(foo.uri, 'MultiArch.xml')
 		lib = iface_cache.get_interface('http://foo/MultiArchLib.xml')
-		reader.update(lib, 'MultiArchLib.xml')
+		self.import_feed(lib.uri, 'MultiArchLib.xml')
 
 		# On an i686 system we can only use the i486 implementation
 
@@ -155,7 +156,7 @@ class TestSolver(BaseTest):
 
 			s = solver.DefaultSolver(self.config)
 			iface = iface_cache.get_interface('http://foo/Langs.xml')
-			reader.update(iface, 'Langs.xml')
+			self.import_feed(iface.uri, 'Langs.xml')
 
 			# 1 is the oldest, but the only one in our language
 			binary_arch = arch.get_architecture(None, 'arch_1')
diff --git a/zeroinstall/cmd/select.py b/zeroinstall/cmd/select.py
index 7892eaf..be341c0 100644
--- a/zeroinstall/cmd/select.py
+++ b/zeroinstall/cmd/select.py
@@ -47,7 +47,7 @@ def get_selections(config, options, iface_uri, select_only, download_only, test_
 	maybe_selections = config.iface_cache.get_feed(iface_uri, selections_ok = True)
 	if isinstance(maybe_selections, selections.Selections):
 		if not select_only:
-			blocker = maybe_selections.download_missing(config.iface_cache, config.fetcher)
+			blocker = maybe_selections.download_missing(config)
 			if blocker:
 				logging.info(_("Waiting for selected implementations to be downloaded..."))
 				config.handler.wait_for_blocker(blocker)
diff --git a/zeroinstall/injector/background.py b/zeroinstall/injector/background.py
index 4ee62a8..3ee4661 100644
--- a/zeroinstall/injector/background.py
+++ b/zeroinstall/injector/background.py
@@ -234,9 +234,9 @@ def spawn_background_update(policy, verbose):
 	# Mark all feeds as being updated. Do this before forking, so that if someone is
 	# running lots of 0launch commands in series on the same program we don't start
 	# huge numbers of processes.
-	for x in policy.implementation:
-		iface_cache.mark_as_checking(x.uri)			# Main feed
-		for f in policy.usable_feeds(x):
+	for uri in policy.solver.selections.selections:
+		iface_cache.mark_as_checking(uri)			# Main feed
+		for f in policy.usable_feeds(iface_cache.get_interface(uri)):
 			iface_cache.mark_as_checking(f.uri)		# Extra feeds
 
 	if _detach():
diff --git a/zeroinstall/injector/iface_cache.py b/zeroinstall/injector/iface_cache.py
index c559dae..ea4aedd 100644
--- a/zeroinstall/injector/iface_cache.py
+++ b/zeroinstall/injector/iface_cache.py
@@ -193,10 +193,7 @@ class IfaceCache(object):
 
 	@property
 	def stores(self):
-		"""deprecated"""
-		from zeroinstall.injector import policy
-		#raise Exception("iface_cache.stores")
-		return policy.get_deprecated_singleton_config().stores
+		raise Exception("Use config.stores instead")
 
 	@property
 	def distro(self):
@@ -372,7 +369,7 @@ class IfaceCache(object):
 
 		debug(_("Initialising new interface object for %s"), uri)
 		self._interfaces[uri] = Interface(uri)
-		reader.update_from_cache(self._interfaces[uri])
+		reader.update_from_cache(self._interfaces[uri], iface_cache = self)
 		return self._interfaces[uri]
 
 	def list_all_interfaces(self):
diff --git a/zeroinstall/injector/policy.py b/zeroinstall/injector/policy.py
index 9e57ab7..c58591b 100644
--- a/zeroinstall/injector/policy.py
+++ b/zeroinstall/injector/policy.py
@@ -322,12 +322,13 @@ class Policy(object):
 	def get_uncached_implementations(self):
 		"""List all chosen implementations which aren't yet available locally.
 		@rtype: [(L{model.Interface}, L{model.Implementation})]"""
+		iface_cache = self.config.iface_cache
 		uncached = []
-		for iface in self.solver.selections:
-			impl = self.solver.selections[iface]
+		for uri, selection in self.solver.selections.selections.iteritems():
+			impl = selection.impl
 			assert impl, self.solver.selections
 			if not self.get_cached(impl):
-				uncached.append((iface, impl))
+				uncached.append((iface_cache.get_interface(uri), impl))
 		return uncached
 
 	def refresh_all(self, force = True):
diff --git a/zeroinstall/injector/reader.py b/zeroinstall/injector/reader.py
index c4fa951..1ee7c6f 100644
--- a/zeroinstall/injector/reader.py
+++ b/zeroinstall/injector/reader.py
@@ -161,7 +161,7 @@ def check_readable(feed_url, source):
 			{'uri': feed_url, 'source': source, 'exception': ex})
 		raise InvalidInterface(_("Error loading feed '%(uri)s':\n\n%(exception)s") % {'uri': feed_url, 'exception': ex})
 
-def update(interface, source, local = False):
+def update(interface, source, local = False, iface_cache = None):
 	"""Read in information about an interface.
 	Deprecated.
 	@param interface: the interface object to update
@@ -183,9 +183,6 @@ def update(interface, source, local = False):
 						"%(interface_uri)s was requested") %
 						{'feed_url': feed.url, 'interface_uri': interface.uri})
 
-	# Hack.
-	from zeroinstall.injector import policy
-	iface_cache = policy.get_deprecated_singleton_config().iface_cache
 	iface_cache._feeds[unicode(interface.uri)] = feed
 
 	return feed
diff --git a/zeroinstall/injector/selections.py b/zeroinstall/injector/selections.py
index 95d9fbf..43597fc 100644
--- a/zeroinstall/injector/selections.py
+++ b/zeroinstall/injector/selections.py
@@ -246,21 +246,23 @@ class Selections(object):
 	def __repr__(self):
 		return "Selections for " + self.interface
 
-	def download_missing(self, iface_cache, fetcher):
+	def download_missing(self, config):
 		"""Check all selected implementations are available.
 		Download any that are not present.
 		Note: package implementations (distribution packages) are ignored.
-		@param iface_cache: cache to find feeds with download information
-		@param fetcher: used to download missing implementations
+		@param config: used to get iface_cache, stores and fetcher
 		@return: a L{tasks.Blocker} or None"""
 		from zeroinstall.zerostore import NotStored
 
+		iface_cache = config.iface_cache
+		stores = config.stores
+
 		# Check that every required selection is cached
 		needed_downloads = []
 		for sel in self.selections.values():
 			if (not sel.local_path) and (not sel.id.startswith('package:')):
 				try:
-					iface_cache.stores.lookup_any(sel.digests)
+					stores.lookup_any(sel.digests)
 				except NotStored:
 					needed_downloads.append(sel)
 		if not needed_downloads:
@@ -278,7 +280,7 @@ class Selections(object):
 				feed_url = sel.attrs.get('from-feed', None) or sel.attrs['interface']
 				feed = iface_cache.get_feed(feed_url)
 				if feed is None or sel.id not in feed.implementations:
-					fetch_feed = fetcher.download_and_import_feed(feed_url, iface_cache)
+					fetch_feed = config.fetcher.download_and_import_feed(feed_url, iface_cache)
 					yield fetch_feed
 					tasks.check(fetch_feed)
 
@@ -287,7 +289,7 @@ class Selections(object):
 				impl = feed.implementations[sel.id]
 				needed_impls.append(impl)
 
-			fetch_impls = fetcher.download_impls(needed_impls, iface_cache.stores)
+			fetch_impls = config.fetcher.download_impls(needed_impls, stores)
 			yield fetch_impls
 			tasks.check(fetch_impls)
 		return download()
-- 
2.11.4.GIT