[Checkins] SVN: zc.buildout/branches/env-cache/src/zc/buildout/ These tests use easy_install in the test process and so need to clear

Ross Patterson me at rpatterson.net
Sat Jan 21 11:44:32 UTC 2012


Log message for revision 124121:
  These tests use easy_install in the test process and so need to clear
  the env cache when they change the filesystem egg layout.

Changed:
  U   zc.buildout/branches/env-cache/src/zc/buildout/easy_install.txt
  U   zc.buildout/branches/env-cache/src/zc/buildout/tests.py

-=-
Modified: zc.buildout/branches/env-cache/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/env-cache/src/zc/buildout/easy_install.txt	2012-01-21 11:44:19 UTC (rev 124120)
+++ zc.buildout/branches/env-cache/src/zc/buildout/easy_install.txt	2012-01-21 11:44:31 UTC (rev 124121)
@@ -227,6 +227,7 @@
 unzipped without this flag.)
 
     >>> rmdir(dest)
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> dest = tmpdir('sample-install')
     >>> ws = zc.buildout.easy_install.install(
     ...     ['demo'], dest, links=[link_server], index=link_server+'index/',
@@ -237,6 +238,7 @@
     d  demoneeded-1.1-py2.4.egg
 
     >>> rmdir(dest)
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> dest = tmpdir('sample-install')
     >>> ws = zc.buildout.easy_install.install(
     ...     ['demo'], dest, links=[link_server], index=link_server+'index/',
@@ -254,6 +256,7 @@
 The old default is returned:
 
     >>> rmdir(dest)
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> dest = tmpdir('sample-install')
     >>> ws = zc.buildout.easy_install.install(
     ...     ['demo'], dest, links=[link_server], index=link_server+'index/')
@@ -267,6 +270,7 @@
     True
 
     >>> rmdir(dest)
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> dest = tmpdir('sample-install')
     >>> ws = zc.buildout.easy_install.install(
     ...     ['demo'], dest, links=[link_server], index=link_server+'index/')
@@ -276,6 +280,7 @@
     -  demoneeded-1.1-py2.4.egg
 
     >>> rmdir(dest)
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> dest = tmpdir('sample-install')
     >>> ws = zc.buildout.easy_install.install(
     ...     ['demo'], dest, links=[link_server], index=link_server+'index/',
@@ -1743,6 +1748,7 @@
     >>> import os
     >>> for name in os.listdir(dest):
     ...     remove(dest, name)
+    >>> zc.buildout.easy_install.clear_index_cache()
 
     >>> zc.buildout.easy_install.build(
     ...   'extdemo', dest,
@@ -1842,6 +1848,7 @@
 We'll recreate our destination directory:
 
     >>> remove(dest)
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> dest = tmpdir('sample-install')
 
 We'd like to see what is being fetched from the server, so we'll
@@ -1892,6 +1899,7 @@
 Let's recreate our destination directory and clear the index cache:
 
     >>> remove(dest)
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> dest = tmpdir('sample-install')
     >>> zc.buildout.easy_install.clear_index_cache()
 

Modified: zc.buildout/branches/env-cache/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/env-cache/src/zc/buildout/tests.py	2012-01-21 11:44:19 UTC (rev 124120)
+++ zc.buildout/branches/env-cache/src/zc/buildout/tests.py	2012-01-21 11:44:31 UTC (rev 124121)
@@ -869,6 +869,7 @@
 
 We do not get a warning, but we do get setuptools included in the working set:
 
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> [dist.project_name
     ...  for dist in zc.buildout.easy_install.working_set(
     ...    ['foox'], sys.executable,
@@ -902,6 +903,7 @@
     Develop: '/sample-buildout/foo'
     Develop: '/sample-buildout/bar'
 
+    >>> zc.buildout.easy_install.clear_index_cache()
     >>> [dist.project_name
     ...  for dist in zc.buildout.easy_install.working_set(
     ...    ['bar'], sys.executable,



More information about the checkins mailing list