From e61f1e90e408c53332ce96f95c4def88f0bb9044 Mon Sep 17 00:00:00 2001
From: Mark Seaborn <mrs@mythic-beasts.com>
Date: Tue, 28 Oct 2008 22:29:24 +0000
Subject: [PATCH] Add an almost end-to-end test which checks the output of a
 command

---
 tests/basetest.py             | 32 +++++++++++++------------
 tests/testendtoend.py         | 55 +++++++++++++++++++++++++++++++++++++++++++
 zeroinstall/injector/fetch.py |  5 +++-
 3 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 tests/testendtoend.py

diff --git a/tests/basetest.py b/tests/basetest.py
index 0ba8a31..e994343 100755
--- a/tests/basetest.py
+++ b/tests/basetest.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2.4
-import sys, tempfile, os, shutil, StringIO
+import sys, tempfile, os, StringIO
 import unittest
 import logging
 import warnings
@@ -26,10 +26,12 @@ empty_feed = qdom.parse(StringIO.StringIO("""<interface xmlns='http://zero-insta
 
 class BaseTest(unittest.TestCase):
 	def setUp(self):
-		self.config_home = tempfile.mktemp()
-		self.cache_home = tempfile.mktemp()
-		self.cache_system = tempfile.mktemp()
-		self.gnupg_home = tempfile.mktemp()
+		self._on_teardown = []
+		self.config_home = self.make_temp_dir()
+		self.cache_home = self.make_temp_dir()
+		self.cache_system = self.make_temp_dir()
+		self.gnupg_home = self.make_temp_dir()
+		os.chmod(self.cache_system, 0500) # Read-only
 		os.environ['GNUPGHOME'] = self.gnupg_home
 		os.environ['XDG_CONFIG_HOME'] = self.config_home
 		os.environ['XDG_CACHE_HOME'] = self.cache_home
@@ -38,11 +40,6 @@ class BaseTest(unittest.TestCase):
 		assert basedir.xdg_config_home == self.config_home
 		iface_cache.iface_cache.__init__()
 
-		os.mkdir(self.config_home, 0700)
-		os.mkdir(self.cache_home, 0700)
-		os.mkdir(self.cache_system, 0500)
-		os.mkdir(self.gnupg_home, 0700)
-
 		if os.environ.has_key('DISPLAY'):
 			del os.environ['DISPLAY']
 		namespaces.injector_gui_uri = os.path.join(os.path.dirname(__file__), 'test-gui.xml')
@@ -56,10 +53,15 @@ class BaseTest(unittest.TestCase):
 
 		distro._host_distribution = distro.DebianDistribution(dpkgdir)
 	
-	def tearDown(self):
-		shutil.rmtree(self.config_home)
-		support.ro_rmtree(self.cache_home)
-		shutil.rmtree(self.cache_system)
-		shutil.rmtree(self.gnupg_home)
+	def make_temp_dir(self):
+		temp_dir = tempfile.mkdtemp(
+			prefix="tmp-%s-" % self.__class__.__name__)
+		def tear_down():
+			support.ro_rmtree(temp_dir)
+		self._on_teardown.append(tear_down)
+		return temp_dir
 
+	def tearDown(self):
 		os.environ['PATH'] = self.old_path
+		for func in reversed(self._on_teardown):
+			func()
diff --git a/tests/testendtoend.py b/tests/testendtoend.py
new file mode 100644
index 0000000..a820c90
--- /dev/null
+++ b/tests/testendtoend.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python2.4
+import os
+import subprocess
+import sys
+import unittest
+
+sys.path.insert(0, '..')
+
+from basetest import BaseTest
+from zeroinstall.injector import autopolicy
+from zeroinstall.injector import run
+from zeroinstall.injector.iface_cache import iface_cache
+
+
+def write_file(filename, data):
+	fh = open(filename, "w")
+	try:
+		fh.write(data)
+	finally:
+		fh.close()
+
+
+class TestEndToEnd(BaseTest):
+	def test(self):
+		tempdir = self.make_temp_dir()
+		feed_file = os.path.join(tempdir, "foo.xml")
+		write_file(feed_file, """
+<interface xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+  <name>Test</name>
+  <summary>Placeholder</summary>
+  <group main="HelloWorld/main">
+    <implementation id="sha1=3ce644dc725f1d21cfcf02562c76f375944b266a"
+         version="1">
+      <archive href="%(dir)s/HelloWorld.tgz" size="176"/>
+    </implementation>
+  </group>
+</interface>
+""" % {"dir": os.path.abspath(os.path.dirname(__file__))})
+		policy = autopolicy.AutoPolicy(
+			feed_file, download_only=True, dry_run=False)
+		policy.download_and_execute([])
+		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, "Hello World\n")
+
+
+suite = unittest.makeSuite(TestEndToEnd)
+if __name__ == '__main__':
+	sys.argv.append('-v')
+	unittest.main()
diff --git a/zeroinstall/injector/fetch.py b/zeroinstall/injector/fetch.py
index c067901..aacdb7e 100644
--- a/zeroinstall/injector/fetch.py
+++ b/zeroinstall/injector/fetch.py
@@ -268,7 +268,10 @@ class Fetcher(object):
 		from zeroinstall.zerostore import unpack
 
 		url = download_source.url
-		if not (url.startswith('http:') or url.startswith('https:') or url.startswith('ftp:')):
+		if not (url.startswith('http:') or
+			url.startswith('https:') or
+			url.startswith('ftp:') or
+			url.startswith('/')):
 			raise SafeException("Unknown scheme in download URL '%s'" % url)
 
 		mime_type = download_source.type
-- 
2.11.4.GIT