[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools/tests - test_include.py:1.19

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/zpkgtools/zpkgtools/tests
In directory cvs.zope.org:/tmp/cvs-serv6613/zpkgtools/tests

Modified Files:
	test_include.py 
Log Message:
There's an edge case when a directory is included explicity by a
parent, but includes a PACKAGE_CONF file itself.  The nested
PACKAGE_CONF wasn't being processed.

This fixes that edge case and adds a test that guards against a
regression for that case.


=== Packages/zpkgtools/zpkgtools/tests/test_include.py 1.18 => 1.19 ===
--- Packages/zpkgtools/zpkgtools/tests/test_include.py:1.18	Tue May 25 10:34:19 2004
+++ Packages/zpkgtools/zpkgtools/tests/test_include.py	Tue May 25 16:07:47 2004
@@ -330,6 +330,20 @@
                           self.processor.createDistributionTree,
                           self.destination, specs.collection)
 
+    def test_package_conf_processed_in_inclusion(self):
+        # There's an edge case when a directory is included explicity
+        # by a parent, but includes a PACKAGE_CONF file itself; at one
+        # point, the nested PACKAGE_CONF wasn't being processed.  This
+        # test guards against a regression for that case.
+        self.source = os.path.join(self.source, "input", "collection-2")
+        specs = include.load(self.source)
+        specs.collection.cook()
+        self.processor.createDistributionTree(self.destination,
+                                              specs.collection)
+        included = os.path.join(self.destination, "included")
+        self.assert_(os.path.isdir(included))
+        self.failIf(os.path.exists(os.path.join(included, "dropped.txt")))
+
     def check_file(self, name):
         srcname = join(self.source, name)
         destname = join(self.destination, name)