From 950f63cea46d9ae4703f1d5d4f68cce1207e4f4a Mon Sep 17 00:00:00 2001
From: Mark Seaborn <mrs@mythic-beasts.com>
Date: Sun, 2 Nov 2008 17:05:26 +0000
Subject: [PATCH] Add test with an example of a feed with a dependency  *
 Refactor run.execute(): split out environment-setting into a separate
 function

---
 tests/basetest.py           | 13 +++++++
 tests/testendtoend.py       | 89 +++++++++++++++++++++++++++++++++++----------
 zeroinstall/injector/run.py | 25 +++++++------
 3 files changed, 95 insertions(+), 32 deletions(-)

diff --git a/tests/basetest.py b/tests/basetest.py
index fe58028..f09cbd5 100755
--- a/tests/basetest.py
+++ b/tests/basetest.py
@@ -25,6 +25,14 @@ empty_feed = qdom.parse(StringIO.StringIO("""<interface xmlns='http://zero-insta
 </interface>"""))
 
 
+def write_file(filename, data):
+	fh = open(filename, "w")
+	try:
+		fh.write(data)
+	finally:
+		fh.close()
+
+
 def assert_sets_equal(actual, expected):
 	if sorted(actual) != sorted(expected):
 		missing = [x for x in expected if x not in actual]
@@ -73,6 +81,11 @@ class BaseTest(unittest.TestCase):
 		self._on_teardown.append(tear_down)
 		return temp_dir
 
+	def make_temp_file(self, data):
+		filename = os.path.join(self.make_temp_dir(), "file")
+		write_file(filename, data)
+		return filename
+
 	def patch_env_var(self, key, value):
 		old_value = os.environ.get(key)
 		def restore():
diff --git a/tests/testendtoend.py b/tests/testendtoend.py
index 356b803..d006bca 100644
--- a/tests/testendtoend.py
+++ b/tests/testendtoend.py
@@ -7,20 +7,13 @@ import unittest
 sys.path.insert(0, '..')
 
 from basetest import BaseTest
+from basetest import write_file
 from zeroinstall.injector import autopolicy
 from zeroinstall.injector import run
 from zeroinstall.injector.iface_cache import iface_cache
 from zeroinstall.zerostore import manifest
 
 
-def write_file(filename, data):
-	fh = open(filename, "w")
-	try:
-		fh.write(data)
-	finally:
-		fh.close()
-
-
 # Based on code in 0publish/archive.py
 def manifest_for_dir(dir):
 	algorithm = manifest.get_algorithm("sha1new")
@@ -30,15 +23,26 @@ def manifest_for_dir(dir):
 	return algorithm.getID(digest)
 
 
+class FileTreeWriter(object):
+
+	def __init__(self, files):
+		self._files = files
+
+	def write_tree(self, dest_path):
+		for filename, data in self._files:
+			pathname = os.path.join(dest_path, filename)
+			if not os.path.exists(os.path.dirname(pathname)):
+				os.makedirs(os.path.dirname(pathname))
+			write_file(pathname, data)
+			# Making everything executable is simpler.
+			os.chmod(pathname, 0777)
+
+
 class TestEndToEnd(BaseTest):
-	def _make_hello(self):
+	def _make_archive(self, tree):
 		tar_file = os.path.join(self.make_temp_dir(), "archive.tar.gz")
 		temp_dir = self.make_temp_dir()
-		write_file(os.path.join(temp_dir, "hello-test"), """\
-#!/bin/sh
-echo Hello World
-""")
-		os.chmod(os.path.join(temp_dir, "hello-test"), 0777)
+		tree.write_tree(temp_dir)
 		subprocess.check_call(["tar", "-czf", tar_file, "-C", temp_dir, "."])
 		return """
       <implementation id="%s" version="1">
@@ -46,10 +50,12 @@ echo Hello World
       </implementation>
       """ % (manifest_for_dir(temp_dir), tar_file, os.path.getsize(tar_file))
 
-	def test(self):
-		tempdir = self.make_temp_dir()
-		feed_file = os.path.join(tempdir, "foo.xml")
-		write_file(feed_file, """
+	def test_module_with_no_dependencies(self):
+		tree = FileTreeWriter([("hello-test", """\
+#!/bin/sh
+echo Hello world!
+""")])
+		feed_file = self.make_temp_file("""
 <interface xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
   <name>Test</name>
   <summary>Placeholder</summary>
@@ -57,7 +63,7 @@ echo Hello World
     %s
   </group>
 </interface>
-""" % self._make_hello())
+""" % self._make_archive(tree))
 		policy = autopolicy.AutoPolicy(
 			feed_file, download_only=True, dry_run=False)
 		policy.download_and_execute([])
@@ -68,7 +74,50 @@ echo Hello World
 		proc = subprocess.Popen([cmd_path], stdout=subprocess.PIPE)
 		stdout, stderr = proc.communicate()
 		self.assertEquals(proc.wait(), 0)
-		self.assertEquals(stdout, "Hello World\n")
+		self.assertEquals(stdout, "Hello world!\n")
+
+	def test_module_with_dependency(self):
+		library_tree = FileTreeWriter([("share/useful", "useful-contents\n")])
+		main_tree = FileTreeWriter([("bin/hello-test", """\
+#!/bin/sh
+echo Got:
+cat $LIBFOO/share/useful
+""")])
+		library_feed = self.make_temp_file("""\
+<?xml version="1.0" ?>
+<interface xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+  <name>Test</name>
+  <summary>Placeholder</summary>
+  <group>
+    %s
+  </group>
+</interface>
+""" % self._make_archive(library_tree))
+		main_feed = self.make_temp_file("""
+<interface xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+  <name>Test</name>
+  <summary>Placeholder</summary>
+  <group main="bin/hello-test">
+    %s
+    <requires interface="%s">
+      <environment name="LIBFOO" insert="."/>
+    </requires>
+  </group>
+</interface>
+""" % (self._make_archive(main_tree), library_feed))
+		policy = autopolicy.AutoPolicy(
+			main_feed, download_only=True, dry_run=False)
+		policy.download_and_execute([])
+		self.changes_environ()
+		run.add_env_bindings(policy)
+		root_impl = policy.get_implementation(
+			iface_cache.get_interface(policy.root))
+		cmd_path = os.path.join(run._get_implementation_path(root_impl.id),
+					root_impl.main)
+		proc = subprocess.Popen([cmd_path], stdout=subprocess.PIPE)
+		stdout, stderr = proc.communicate()
+		self.assertEquals(proc.wait(), 0)
+		self.assertEquals(stdout, "Got:\nuseful-contents\n")
 
 
 suite = unittest.makeSuite(TestEndToEnd)
diff --git a/zeroinstall/injector/run.py b/zeroinstall/injector/run.py
index d3c0971..b81b515 100644
--- a/zeroinstall/injector/run.py
+++ b/zeroinstall/injector/run.py
@@ -21,6 +21,18 @@ def do_env_binding(binding, path):
 					os.environ.get(binding.name, None))
 	info("%s=%s", binding.name, os.environ[binding.name])
 
+def add_env_bindings(policy):
+	for impl in policy.implementation.values():
+		assert impl
+		_do_bindings(impl, impl.bindings)
+		for dep in impl.requires:
+			dep_iface = iface_cache.get_interface(dep.interface)
+			dep_impl = policy.get_implementation(dep_iface)
+			if isinstance(dep_impl, ZeroInstallImplementation):
+				_do_bindings(dep_impl, dep.bindings)
+			else:
+				debug("Implementation %s is native; no bindings needed", dep_impl)
+
 def execute(policy, prog_args, dry_run = False, main = None, wrapper = None):
 	"""Execute program. On success, doesn't return. On failure, raises an Exception.
 	Returns normally only for a successful dry run.
@@ -37,18 +49,7 @@ def execute(policy, prog_args, dry_run = False, main = None, wrapper = None):
 	@precondition: C{policy.ready and policy.get_uncached_implementations() == []}
 	"""
 	iface = iface_cache.get_interface(policy.root)
-		
-	for impl in policy.implementation.values():
-		assert impl
-		_do_bindings(impl, impl.bindings)
-		for dep in impl.requires:
-			dep_iface = iface_cache.get_interface(dep.interface)
-			dep_impl = policy.get_implementation(dep_iface)
-			if isinstance(dep_impl, ZeroInstallImplementation):
-				_do_bindings(dep_impl, dep.bindings)
-			else:
-				debug("Implementation %s is native; no bindings needed", dep_impl)
-
+	add_env_bindings(policy)
 	root_impl = policy.get_implementation(iface)
 	_execute(root_impl, prog_args, dry_run, main, wrapper)
 
-- 
2.11.4.GIT