[Checkins] SVN: zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/ Fixed the tests to work with GROUPs that aren't the same as the USER.
Aaron Lehmann
aaron at zope.com
Tue Oct 13 14:01:57 EDT 2009
Log message for revision 105052:
Fixed the tests to work with GROUPs that aren't the same as the USER.
Changed:
U zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/README.txt
U zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/rtests.py
-=-
Modified: zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/README.txt
===================================================================
--- zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/README.txt 2009-10-13 16:28:22 UTC (rev 105051)
+++ zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/README.txt 2009-10-13 18:01:57 UTC (rev 105052)
@@ -19,22 +19,22 @@
Installing foo.
zc.recipe.deployment:
Creating 'PREFIX/etc/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/run/foo',
- mode 750, user 'USER', group 'USER'
+ mode 750, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/cron.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/init.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/logrotate.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
Note that we are providing a prefix and an etc-user here. These options
@@ -45,13 +45,13 @@
>>> import os
>>> print ls(os.path.join(sample_buildout, 'etc/foo'))
- drwxr-xr-x USER USER PREFIX/etc/foo
+ drwxr-xr-x USER GROUP PREFIX/etc/foo
>>> print ls(os.path.join(sample_buildout, 'var/log/foo'))
- drwxr-xr-x USER USER PREFIX/var/log/foo
+ drwxr-xr-x USER GROUP PREFIX/var/log/foo
>>> print ls(os.path.join(sample_buildout, 'var/run/foo'))
- drwxr-x--- USER USER PREFIX/var/run/foo
+ drwxr-x--- USER GROUP PREFIX/var/run/foo
By looking at .installed.cfg, we can see the options available for use
by other recipes:
@@ -101,22 +101,22 @@
Installing foo.
zc.recipe.deployment:
Creating 'PREFIX/etc/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/run/foo',
- mode 750, user 'USER', group 'USER'
+ mode 750, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/cron.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/init.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/logrotate.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
>>> write(os.path.join(sample_buildout, 'etc/foo/x'), '')
>>> write(os.path.join(sample_buildout, 'var/log/foo/x'), '')
@@ -138,10 +138,10 @@
False
>>> print ls(os.path.join(sample_buildout, 'var/log/foo'))
- drwxr-xr-x USER USER PREFIX/var/log/foo
+ drwxr-xr-x USER GROUP PREFIX/var/log/foo
>>> print ls(os.path.join(sample_buildout, 'var/run/foo'))
- drwxr-x--- USER USER PREFIX/var/run/foo
+ drwxr-x--- USER GROUP PREFIX/var/run/foo
Here we see that the var and run directories are kept. The etc
directory is discarded because only buildout recipes should write to
@@ -154,22 +154,22 @@
Installing foo.
zc.recipe.deployment:
Creating 'PREFIX/etc/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Updating 'PREFIX/var/log/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Updating 'PREFIX/var/run/foo',
- mode 750, user 'USER', group 'USER'
+ mode 750, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/cron.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/init.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/logrotate.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
>>> os.remove(os.path.join(sample_buildout, 'var/log/foo/x'))
>>> os.remove(os.path.join(sample_buildout, 'var/run/foo/x'))
@@ -215,32 +215,32 @@
Installing foo.
zc.recipe.deployment:
Creating 'PREFIX/etc/bar',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/log/bar',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/run/bar',
- mode 750, user 'USER', group 'USER'
+ mode 750, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/cron.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/init.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/logrotate.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
>>> print ls(os.path.join(sample_buildout, 'etc/bar'))
- drwxr-xr-x USER USER PREFIX/etc/bar
+ drwxr-xr-x USER GROUP PREFIX/etc/bar
>>> print ls(os.path.join(sample_buildout, 'var/log/bar'))
- drwxr-xr-x USER USER PREFIX/var/log/bar
+ drwxr-xr-x USER GROUP PREFIX/var/log/bar
>>> print ls(os.path.join(sample_buildout, 'var/run/bar'))
- drwxr-x--- USER USER PREFIX/var/run/bar
+ drwxr-x--- USER GROUP PREFIX/var/run/bar
>>> cat('.installed.cfg') # doctest: +ELLIPSIS
[buildout]
@@ -306,22 +306,22 @@
Installing foo.
zc.recipe.deployment:
Creating 'PREFIX/etc/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/run/foo',
- mode 750, user 'USER', group 'USER'
+ mode 750, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/cron.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/init.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/logrotate.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
Installing x.cfg.
By default, the configuration is installed as a part:
@@ -478,22 +478,22 @@
Installing foo.
zc.recipe.deployment:
Creating 'PREFIX/etc/bar',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/log/bar',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/var/run/bar',
- mode 750, user 'USER', group 'USER'
+ mode 750, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/cron.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/init.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
Creating 'PREFIX/etc/logrotate.d',
- mode 755, user 'USER', group 'USER'
+ mode 755, user 'USER', group 'GROUP'
Installing cron.
>>> open(os.path.join(sample_buildout, 'etc/cron.d/bar-cron')).read()
Modified: zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/rtests.py
===================================================================
--- zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/rtests.py 2009-10-13 16:28:22 UTC (rev 105051)
+++ zc.recipe.deployment/branches/aaron-nonroot/src/zc/recipe/deployment/rtests.py 2009-10-13 18:01:57 UTC (rev 105052)
@@ -64,7 +64,18 @@
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([
(re.compile('\d+ \d\d\d\d-\d\d-\d\d \d\d:\d\d'), ''),
- (re.compile(user), 'USER'),
+
+ # The ordering of these regexps is important. If they are in a
+ # different order, they will break on systems where the user
+ # and group are the same (default of linux)
+
+ (re.compile("user '%s'" % user), "user 'USER'"),
+ (re.compile("group '%s'" % group), "group 'GROUP'"),
+ (re.compile("%s %s" % (user, group)), "USER GROUP"),
+ (re.compile(user), "USER"),
+
+ # The order doesn't matter after this point
+
(re.compile('/.*/sample-buildout'), 'PREFIX'),
## zc.buildout.testing.normalize_path,
More information about the checkins
mailing list