[Checkins] SVN: zc.zope3recipes/branches/0.6/ Replaced "offline=true" everywhere with "newest=false" in the SetUp,

[Christophe Combelles]

Log message for revision 89814:
  Replaced "offline=true" everywhere with "newest=false" in the SetUp,
  to prevent upgrades during tests
  

Changed:
  U   zc.zope3recipes/branches/0.6/README.txt
  U   zc.zope3recipes/branches/0.6/setup.py
  U   zc.zope3recipes/branches/0.6/zc/zope3recipes/README.txt
  U   zc.zope3recipes/branches/0.6/zc/zope3recipes/tests.py

-=-
Modified: zc.zope3recipes/branches/0.6/README.txt
===================================================================
--- zc.zope3recipes/branches/0.6/README.txt	2008-08-13 22:05:34 UTC (rev 89813)
+++ zc.zope3recipes/branches/0.6/README.txt	2008-08-13 22:27:06 UTC (rev 89814)
@@ -16,7 +16,12 @@
 
 Releases
 ********
+=====================
+0.6.2dev (unreleased)
+=====================
 
+Added the "newest=false" option in the SetUp to prevent upgrade during tests
+
 ==================
 0.6.1 (2007/12/17)
 ==================

Modified: zc.zope3recipes/branches/0.6/setup.py
===================================================================
--- zc.zope3recipes/branches/0.6/setup.py	2008-08-13 22:05:34 UTC (rev 89813)
+++ zc.zope3recipes/branches/0.6/setup.py	2008-08-13 22:27:06 UTC (rev 89814)
@@ -7,7 +7,7 @@
 name = "zc.zope3recipes"
 setup(
     name = name,
-    version = "0.6.1",
+    version = "0.6.2dev",
     author = "Jim Fulton",
     author_email = "jim at zope.com",
     description = "ZC Buildout recipe for defining Zope 3 applications",

Modified: zc.zope3recipes/branches/0.6/zc/zope3recipes/README.txt
===================================================================
--- zc.zope3recipes/branches/0.6/zc/zope3recipes/README.txt	2008-08-13 22:05:34 UTC (rev 89813)
+++ zc.zope3recipes/branches/0.6/zc/zope3recipes/README.txt	2008-08-13 22:27:06 UTC (rev 89814)
@@ -46,6 +46,8 @@
     ... setup(name = 'demo2', install_requires='demo1')
     ... ''')
 
+.. Please note that the "newest=false" option is set in the test SetUp to prevent upgrades
+
 We'll create a buildout.cfg file that defines our application:
 
     >>> write('buildout.cfg',
@@ -53,7 +55,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = myapp
-    ... offline = true
     ...
     ... [myapp]
     ... recipe = zc.zope3recipes:application
@@ -146,7 +147,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = myapp
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -290,7 +290,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = myapp
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -346,7 +345,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = myapp
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -454,7 +452,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = myapp
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -574,7 +571,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -687,7 +683,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -767,7 +762,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -858,7 +852,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -939,7 +932,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -1020,7 +1012,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -1123,7 +1114,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -1223,7 +1213,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -1320,7 +1309,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -1470,7 +1458,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s
@@ -1612,7 +1599,6 @@
     ... [buildout]
     ... develop = demo1 demo2
     ... parts = instance instance2
-    ... offline = true
     ...
     ... [zope3]
     ... location = %(zope3)s

Modified: zc.zope3recipes/branches/0.6/zc/zope3recipes/tests.py
===================================================================
--- zc.zope3recipes/branches/0.6/zc/zope3recipes/tests.py	2008-08-13 22:05:34 UTC (rev 89813)
+++ zc.zope3recipes/branches/0.6/zc/zope3recipes/tests.py	2008-08-13 22:27:06 UTC (rev 89814)
@@ -32,7 +32,6 @@
     ... '''
     ... [buildout]
     ... parts = ctl
-    ... offline = true
     ...
     ... [ctl]
     ... recipe = zc.recipe.egg
@@ -95,7 +94,6 @@
     ... '''
     ... [buildout]
     ... parts = instance
-    ... offline = true
     ...
     ... [myapp]
     ... location = foo
@@ -125,6 +123,21 @@
     zc.buildout.testing.install('zdaemon', test)
     zc.buildout.testing.install('ZConfig', test)
     zc.buildout.testing.install('zc.recipe.filestorage', test)
+    # prevent upgrade during test
+    if not os.path.exists(os.environ['HOME']):
+        os.mkdir(os.environ['HOME'])
+    buildout_defaults_dir = os.path.join(os.environ['HOME'],
+                                        '.buildout')
+    buildout_defaults_file = os.path.join(buildout_defaults_dir,
+                                          'default.cfg')
+    if not os.path.exists(buildout_defaults_dir):
+        os.mkdir(buildout_defaults_dir)
+    if not os.path.exists(buildout_defaults_file):
+        open(buildout_defaults_file, 'w').write(
+        "[buildout]\n"
+        "newest = false")
+    else:
+        raise RuntimeWarning('Unable to set "newest=false" for tests')
 
 
 checker = renormalizing.RENormalizing([