[cedar-backup-svn] SF.net SVN: cedar-backup: [809] cedar-backup2/trunk
Brought to you by:
pronovic
Menu
▾
▴
[cedar-backup-svn] SF.net SVN: cedar-backup: [809] cedar-backup2/trunk
|
From: <pro...@us...> - 2007-12-15 21:40:56
|
Revision: 809
http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=809&view=rev
Author: pronovic
Date: 2007-12-15 13:40:44 -0800 (Sat, 15 Dec 2007)
Log Message:
-----------
Add rshCommand to OptionsConfig (and fix some unit test)
Modified Paths:
--------------
cedar-backup2/trunk/CedarBackup2/config.py
cedar-backup2/trunk/test/configtests.py
cedar-backup2/trunk/test/data/cback.conf.15
cedar-backup2/trunk/test/data/cback.conf.20
cedar-backup2/trunk/test/data/cback.conf.21
cedar-backup2/trunk/test/data/cback.conf.6
Modified: cedar-backup2/trunk/CedarBackup2/config.py
===================================================================
--- cedar-backup2/trunk/CedarBackup2/config.py 2007-12-15 21:12:36 UTC (rev 808)
+++ cedar-backup2/trunk/CedarBackup2/config.py 2007-12-15 21:40:44 UTC (rev 809)
@@ -159,9 +159,9 @@
I{Options Validations}
- All fields must be filled in. The rcp command is used as a default value
- for all remote peers in the staging section. Remote peers can also rely on
- the backup user as the default remote user name if they choose.
+ All fields must be filled in except the rsh command. The rcp and rsh
+ commands are used as default values for all remote peers. Remote peers can
+ also rely on the backup user as the default remote user name if they choose.
I{Peers Validations}
@@ -2142,11 +2142,12 @@
- The hooks list must be a list of C{ActionHook} objects.
@sort: __init__, __repr__, __str__, __cmp__, startingDay, workingDir,
- backupUser, backupGroup, rcpCommand, overrides
+ backupUser, backupGroup, rcpCommand, rshCommand, overrides
"""
def __init__(self, startingDay=None, workingDir=None, backupUser=None,
- backupGroup=None, rcpCommand=None, overrides=None, hooks=None):
+ backupGroup=None, rcpCommand=None, overrides=None,
+ hooks=None, rshCommand=None):
"""
Constructor for the C{OptionsConfig} class.
@@ -2155,6 +2156,7 @@
@param backupUser: Effective user that backups should run as.
@param backupGroup: Effective group that backups should run as.
@param rcpCommand: Default rcp-compatible copy command for staging.
+ @param rshCommand: Default rsh-compatible command to use for remote shells.
@param overrides: List of configured command path overrides, if any.
@param hooks: List of configured pre- and post-action hooks.
@@ -2165,6 +2167,7 @@
self._backupUser = None
self._backupGroup = None
self._rcpCommand = None
+ self._rshCommand = None
self._overrides = None
self._hooks = None
self.startingDay = startingDay
@@ -2172,6 +2175,7 @@
self.backupUser = backupUser
self.backupGroup = backupGroup
self.rcpCommand = rcpCommand
+ self.rshCommand = rshCommand
self.overrides = overrides
self.hooks = hooks
@@ -2179,10 +2183,10 @@
"""
Official string representation for class instance.
"""
- return "OptionsConfig(%s, %s, %s, %s, %s, %s, %s)" % (self.startingDay, self.workingDir,
- self.backupUser, self.backupGroup,
- self.rcpCommand, self.overrides,
- self.hooks)
+ return "OptionsConfig(%s, %s, %s, %s, %s, %s, %s, %s)" % (self.startingDay, self.workingDir,
+ self.backupUser, self.backupGroup,
+ self.rcpCommand, self.overrides,
+ self.hooks, self.rshCommand)
def __str__(self):
"""
@@ -2223,6 +2227,11 @@
return -1
else:
return 1
+ if self._rshCommand != other._rshCommand:
+ if self._rshCommand < other._rshCommand:
+ return -1
+ else:
+ return 1
if self._overrides != other._overrides:
if self._overrides < other._overrides:
return -1
@@ -2323,6 +2332,23 @@
"""
return self._rcpCommand
+ def _setRshCommand(self, value):
+ """
+ Property target used to set the rsh command.
+ The value must be a non-empty string if it is not C{None}.
+ @raise ValueError: If the value is an empty string.
+ """
+ if value is not None:
+ if len(value) < 1:
+ raise ValueError("The rsh command must be a non-empty string.")
+ self._rshCommand = value
+
+ def _getRshCommand(self):
+ """
+ Property target used to get the rsh command.
+ """
+ return self._rshCommand
+
def _setOverrides(self, value):
"""
Property target used to set the command path overrides list.
@@ -2374,6 +2400,7 @@
backupUser = property(_getBackupUser, _setBackupUser, None, "Effective user that backups should run as.")
backupGroup = property(_getBackupGroup, _setBackupGroup, None, "Effective group that backups should run as.")
rcpCommand = property(_getRcpCommand, _setRcpCommand, None, "Default rcp-compatible copy command for staging.")
+ rshCommand = property(_getRshCommand, _setRshCommand, None, "Default rsh-compatible command to use for remote shells.")
overrides = property(_getOverrides, _setOverrides, None, "List of configured command path overrides, if any.")
hooks = property(_getHooks, _setHooks, None, "List of configured pre- and post-action hooks.")
@@ -3977,6 +4004,7 @@
backupUser //cb_config/options/backup_user
backupGroup //cb_config/options/backup_group
rcpCommand //cb_config/options/rcp_command
+ rshCommand //cb_config/options/rsh_command
We also read groups of the following items, one list element per
item::
@@ -3999,6 +4027,7 @@
options.backupUser = readString(sectionNode, "backup_user")
options.backupGroup = readString(sectionNode, "backup_group")
options.rcpCommand = readString(sectionNode, "rcp_command")
+ options.rshCommand = readString(sectionNode, "rsh_command")
options.overrides = Config._parseOverrides(sectionNode)
options.hooks = Config._parseHooks(sectionNode)
return options
@@ -4625,6 +4654,7 @@
backupUser //cb_config/options/backup_user
backupGroup //cb_config/options/backup_group
rcpCommand //cb_config/options/rcp_command
+ rshCommand //cb_config/options/rsh_command
We also add groups of the following items, one list element per
item::
@@ -4649,6 +4679,7 @@
addStringNode(xmlDom, sectionNode, "backup_user", optionsConfig.backupUser)
addStringNode(xmlDom, sectionNode, "backup_group", optionsConfig.backupGroup)
addStringNode(xmlDom, sectionNode, "rcp_command", optionsConfig.rcpCommand)
+ addStringNode(xmlDom, sectionNode, "rsh_command", optionsConfig.rshCommand)
if optionsConfig.overrides is not None:
for override in optionsConfig.overrides:
Config._addOverride(xmlDom, sectionNode, override)
@@ -5231,9 +5262,10 @@
"""
Validates options configuration.
- All fields must be filled in. The rcp command is used as a default value
- for all remote peers in the staging section. Remote peers can also rely
- on the backup user as the default remote user name if they choose.
+ All fields must be filled in except the rsh command. The rcp and rsh
+ commands are used as default values for all remote peers. Remote peers
+ can also rely on the backup user as the default remote user name if they
+ choose.
@raise ValueError: If reference configuration is invalid.
"""
Modified: cedar-backup2/trunk/test/configtests.py
===================================================================
--- cedar-backup2/trunk/test/configtests.py 2007-12-15 21:12:36 UTC (rev 808)
+++ cedar-backup2/trunk/test/configtests.py 2007-12-15 21:40:44 UTC (rev 809)
@@ -4299,19 +4299,22 @@
self.failUnlessEqual(None, options.backupUser)
self.failUnlessEqual(None, options.backupGroup)
self.failUnlessEqual(None, options.rcpCommand)
+ self.failUnlessEqual(None, options.rshCommand)
self.failUnlessEqual(None, options.overrides)
def testConstructor_002(self):
"""
Test constructor with all values filled in, with valid values (lists empty).
"""
- options = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", [])
+ options = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", [], [], "ssh")
self.failUnlessEqual("monday", options.startingDay)
self.failUnlessEqual("/tmp", options.workingDir)
self.failUnlessEqual("user", options.backupUser)
self.failUnlessEqual("group", options.backupGroup)
self.failUnlessEqual("scp -1 -B", options.rcpCommand)
+ self.failUnlessEqual("ssh", options.rshCommand)
self.failUnlessEqual([], options.overrides)
+ self.failUnlessEqual([], options.hooks)
def testConstructor_003(self):
"""
@@ -4483,13 +4486,14 @@
Test constructor with all values filled in, with valid values (lists not empty).
"""
overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), ]
- hooks = [ ActionHook("collect", "ls -l"), ]
- options = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks)
+ hooks = [ PreActionHook("collect", "ls -l"), ]
+ options = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
self.failUnlessEqual("monday", options.startingDay)
self.failUnlessEqual("/tmp", options.workingDir)
self.failUnlessEqual("user", options.backupUser)
self.failUnlessEqual("group", options.backupGroup)
self.failUnlessEqual("scp -1 -B", options.rcpCommand)
+ self.failUnlessEqual("ssh", options.rshCommand)
self.failUnlessEqual(overrides, options.overrides)
self.failUnlessEqual(hooks, options.hooks)
@@ -4584,8 +4588,8 @@
"""
collect = OptionsConfig()
self.failUnlessEqual(None, collect.hooks)
- collect.hooks = [ActionHook("stage", "df -k"), ]
- self.failUnlessEqual([ActionHook("stage", "df -k"), ], collect.hooks)
+ collect.hooks = [PreActionHook("stage", "df -k"), ]
+ self.failUnlessEqual([PreActionHook("stage", "df -k"), ], collect.hooks)
def testConstructor_031(self):
"""
@@ -4594,8 +4598,8 @@
"""
collect = OptionsConfig()
self.failUnlessEqual(None, collect.hooks)
- collect.hooks = [ ActionHook("stage", "df -k"), ActionHook("collect", "ls -l"), ]
- self.failUnlessEqual([ActionHook("stage", "df -k"), ActionHook("collect", "ls -l"), ], collect.hooks)
+ collect.hooks = [ PreActionHook("stage", "df -k"), PostActionHook("collect", "ls -l"), ]
+ self.failUnlessEqual([PreActionHook("stage", "df -k"), PostActionHook("collect", "ls -l"), ], collect.hooks)
def testConstructor_032(self):
"""
@@ -4624,10 +4628,37 @@
"""
collect = OptionsConfig()
self.failUnlessEqual(None, collect.hooks)
- self.failUnlessAssignRaises(ValueError, collect, "hooks", [ "hello", ActionHook("stage", "df -k"), ])
+ self.failUnlessAssignRaises(ValueError, collect, "hooks", [ "hello", PreActionHook("stage", "df -k"), ])
self.failUnlessEqual(None, collect.hooks)
+ def testConstructor_035(self):
+ """
+ Test assignment of rshCommand attribute, None value.
+ """
+ options = OptionsConfig(rshCommand="command")
+ self.failUnlessEqual("command", options.rshCommand)
+ options.rshCommand = None
+ self.failUnlessEqual(None, options.rshCommand)
+ def testConstructor_036(self):
+ """
+ Test assignment of rshCommand attribute, valid value.
+ """
+ options = OptionsConfig()
+ self.failUnlessEqual(None, options.rshCommand)
+ options.rshCommand = "command"
+ self.failUnlessEqual("command", options.rshCommand)
+
+ def testConstructor_037(self):
+ """
+ Test assignment of rshCommand attribute, invalid value (empty).
+ """
+ options = OptionsConfig()
+ self.failUnlessEqual(None, options.rshCommand)
+ self.failUnlessAssignRaises(ValueError, options, "rshCommand", "")
+ self.failUnlessEqual(None, options.rshCommand)
+
+
############################
# Test comparison operators
############################
@@ -4652,8 +4683,8 @@
"""
overrides = [ CommandOverride("one", "/one"), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
self.failUnlessEqual(options1, options2)
self.failUnless(options1 == options2)
self.failUnless(not options1 < options2)
@@ -4682,8 +4713,8 @@
"""
overrides = [ CommandOverride("one", "/one"), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks)
- options2 = OptionsConfig("tuesday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
+ options2 = OptionsConfig("tuesday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(options1 < options2)
@@ -4712,8 +4743,8 @@
"""
overrides = [ CommandOverride("one", "/one"), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp/whatever", "user", "group", "scp -1 -B", overrides, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks)
+ options1 = OptionsConfig("monday", "/tmp/whatever", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(not options1 < options2)
@@ -4742,8 +4773,8 @@
"""
overrides = [ CommandOverride("one", "/one"), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user2", "group", "scp -1 -B", overrides, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user1", "group", "scp -1 -B", overrides, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user2", "group", "scp -1 -B", overrides, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user1", "group", "scp -1 -B", overrides, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(not options1 < options2)
@@ -4772,8 +4803,8 @@
"""
overrides = [ CommandOverride("one", "/one"), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group1", "scp -1 -B", overrides, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group2", "scp -1 -B", overrides, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group1", "scp -1 -B", overrides, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group2", "scp -1 -B", overrides, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(options1 < options2)
@@ -4802,8 +4833,8 @@
"""
overrides = [ CommandOverride("one", "/one"), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -2 -B", overrides, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -2 -B", overrides, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(not options1 < options2)
@@ -4820,8 +4851,8 @@
overrides1 = None
overrides2 = []
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(options1 < options2)
@@ -4838,10 +4869,10 @@
overrides1 = None
overrides2 = [ CommandOverride("one", "/one"), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks, "ssh")
self.failIfEqual(options1, options2)
- self.failUnless(not options1 == options2)
+ self.failUnless(not options1 == options2, "ssh")
self.failUnless(options1 < options2)
self.failUnless(options1 <= options2)
self.failUnless(not options1 > options2)
@@ -4856,8 +4887,8 @@
overrides1 = [ CommandOverride("one", "/one"), ]
overrides2 = []
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(not options1 < options2)
@@ -4874,8 +4905,8 @@
overrides1 = [ CommandOverride("one", "/one"), ]
overrides2 = [ CommandOverride(), ]
hooks = [ PreActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides1, hooks, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides2, hooks, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(not options1 < options2)
@@ -4892,8 +4923,8 @@
overrides = [ CommandOverride("one", "/one"), ]
hooks1 = None
hooks2 = []
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(options1 < options2)
@@ -4910,8 +4941,8 @@
overrides = [ CommandOverride("one", "/one"), ]
hooks1 = [ PreActionHook("collect", "ls -l ") ]
hooks2 = [ PostActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(options1 > options2)
@@ -4928,8 +4959,8 @@
overrides = [ CommandOverride("one", "/one"), ]
hooks1 = [ PreActionHook("collect", "ls -l ") ]
hooks2 = [ PreActionHook("stage", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2)
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(not options1 > options2)
@@ -4945,9 +4976,9 @@
"""
overrides = [ CommandOverride("one", "/one"), ]
hooks1 = [ PreActionHook("collect", "ls -l ") ]
- hooks2 = [ ActionHook("collect", "ls -l ") ]
- options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1)
- options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2)
+ hooks2 = [ PostActionHook("collect", "ls -l ") ]
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks1, "ssh")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks2, "ssh")
self.failIfEqual(options1, options2)
self.failUnless(not options1 == options2)
self.failUnless(not options1 < options2)
@@ -4956,7 +4987,37 @@
self.failUnless(options1 >= options2)
self.failUnless(options1 != options2)
+ def testComparison_021(self):
+ """
+ Test comparison of two differing objects, rshCommand differs (one None).
+ """
+ options1 = OptionsConfig()
+ options2 = OptionsConfig(rshCommand="command")
+ self.failIfEqual(options1, options2)
+ self.failUnless(not options1 == options2)
+ self.failUnless(options1 < options2)
+ self.failUnless(options1 <= options2)
+ self.failUnless(not options1 > options2)
+ self.failUnless(not options1 >= options2)
+ self.failUnless(options1 != options2)
+ def testComparison_022(self):
+ """
+ Test comparison of two differing objects, rshCommand differs.
+ """
+ overrides = [ CommandOverride("one", "/one"), ]
+ hooks = [ PreActionHook("collect", "ls -l ") ]
+ options1 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh2")
+ options2 = OptionsConfig("monday", "/tmp", "user", "group", "scp -1 -B", overrides, hooks, "ssh1")
+ self.failIfEqual(options1, options2)
+ self.failUnless(not options1 == options2)
+ self.failUnless(not options1 < options2)
+ self.failUnless(not options1 <= options2)
+ self.failUnless(options1 > options2)
+ self.failUnless(options1 >= options2)
+ self.failUnless(options1 != options2)
+
+
########################
# TestPeersConfig class
########################
@@ -7653,6 +7714,7 @@
self.failUnlessEqual(None, config.reference)
self.failUnlessEqual(None, config.extensions)
self.failUnlessEqual(None, config.options)
+ self.failUnlessEqual(None, config.peers)
self.failUnlessEqual(None, config.collect)
self.failUnlessEqual(None, config.stage)
self.failUnlessEqual(None, config.store)
@@ -7666,6 +7728,7 @@
self.failUnlessEqual(None, config.reference)
self.failUnlessEqual(None, config.extensions)
self.failUnlessEqual(None, config.options)
+ self.failUnlessEqual(None, config.peers)
self.failUnlessEqual(None, config.collect)
self.failUnlessEqual(None, config.stage)
self.failUnlessEqual(None, config.store)
@@ -7689,6 +7752,7 @@
self.failUnlessEqual(None, config.reference)
self.failUnlessEqual(None, config.extensions)
self.failUnlessEqual(None, config.options)
+ self.failUnlessEqual(None, config.peers)
self.failUnlessEqual(None, config.collect)
self.failUnlessEqual(None, config.stage)
self.failUnlessEqual(None, config.store)
@@ -7703,6 +7767,7 @@
self.failUnlessEqual(None, config.reference)
self.failUnlessEqual(None, config.extensions)
self.failUnlessEqual(None, config.options)
+ self.failUnlessEqual(None, config.peers)
self.failUnlessEqual(None, config.collect)
self.failUnlessEqual(None, config.stage)
self.failUnlessEqual(None, config.store)
@@ -7869,7 +7934,30 @@
config = Config()
self.failUnlessAssignRaises(ValueError, config, "purge", CollectDir())
+ def testConstructor_027(self):
+ """
+ Test assignment of peers attribute, None value.
+ """
+ config = Config()
+ config.peers = None
+ self.failUnlessEqual(None, config.peers)
+ def testConstructor_028(self):
+ """
+ Test assignment of peers attribute, valid value.
+ """
+ config = Config()
+ config.peers = PeersConfig()
+ self.failUnlessEqual(PeersConfig(), config.peers)
+
+ def testConstructor_029(self):
+ """
+ Test assignment of peers attribute, invalid value (not PeersConfig).
+ """
+ config = Config()
+ self.failUnlessAssignRaises(ValueError, config, "peers", CollectDir())
+
+
############################
# Test comparison operators
############################
@@ -9860,7 +9948,7 @@
path = self.resources["cback.conf.6"]
config = Config(xmlPath=path, validate=False)
expected = Config()
- expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B")
+ expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
expected.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
expected.options.hooks = [ PreActionHook("collect", "ls -l"), PostActionHook("stage", "df -k"), ]
self.failUnlessEqual(expected, config)
@@ -10103,7 +10191,7 @@
expected.extensions.actions = []
expected.extensions.actions.append(ExtendedAction("example", "something.whatever", "example", 102))
expected.extensions.actions.append(ExtendedAction("bogus", "module", "something", 350))
- expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B")
+ expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
expected.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
expected.options.hooks = [ PreActionHook("collect", "ls -l"), PreActionHook("subversion", "mailx -S \"hello\""), PostActionHook("stage", "df -k"), ]
expected.collect = CollectConfig("/opt/backup/collect", "daily", "targz", ".cbignore")
@@ -10168,7 +10256,7 @@
expected.extensions.actions.append(ExtendedAction("bogus", "module", "something", index=None,
dependencies=ActionDependencies(beforeList=["a", "b", "c",],
afterList=["one",])))
- expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B")
+ expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
expected.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
expected.options.hooks = [ PreActionHook("collect", "ls -l"), PreActionHook("subversion", "mailx -S \"hello\""), PostActionHook("stage", "df -k"), ]
expected.collect = CollectConfig("/opt/backup/collect", "daily", "targz", ".cbignore")
@@ -10230,7 +10318,7 @@
expected.extensions.actions = []
expected.extensions.actions.append(ExtendedAction("example", "something.whatever", "example", 102))
expected.extensions.actions.append(ExtendedAction("bogus", "module", "something", 350))
- expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B")
+ expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
expected.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
expected.options.hooks = [ PreActionHook("collect", "ls -l"), PreActionHook("subversion", "mailx -S \"hello\""), PostActionHook("stage", "df -k"), ]
expected.collect = CollectConfig("/opt/backup/collect", "daily", "targz", ".cbignore")
@@ -10295,7 +10383,7 @@
expected.extensions.actions.append(ExtendedAction("bogus", "module", "something", index=None,
dependencies=ActionDependencies(beforeList=["a", "b", "c",],
afterList=["one",])))
- expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B")
+ expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
expected.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
expected.options.hooks = [ PreActionHook("collect", "ls -l"), PreActionHook("subversion", "mailx -S \"hello\""), PostActionHook("stage", "df -k"), ]
expected.collect = CollectConfig("/opt/backup/collect", "daily", "targz", ".cbignore")
@@ -10439,7 +10527,7 @@
expected.extensions.actions.append(ExtendedAction("bogus", "module", "something", index=None,
dependencies=ActionDependencies(beforeList=["a", "b", "c",],
afterList=["one",])))
- expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B")
+ expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
expected.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
expected.options.hooks = [ PreActionHook("collect", "ls -l"), PreActionHook("subversion", "mailx -S \"hello\""), PostActionHook("stage", "df -k"), ]
expected.peers = PeersConfig()
@@ -10506,7 +10594,7 @@
expected.extensions.actions.append(ExtendedAction("bogus", "module", "something", index=None,
dependencies=ActionDependencies(beforeList=["a", "b", "c",],
afterList=["one",])))
- expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B")
+ expected.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "group", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
expected.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
expected.options.hooks = [ PreActionHook("collect", "ls -l"), PreActionHook("subversion", "mailx -S \"hello\""), PostActionHook("stage", "df -k"), ]
expected.peers = PeersConfig()
@@ -10734,8 +10822,9 @@
Extract document containing only a valid options section, validate=True.
"""
before = Config()
- before.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "backup", "/usr/bin/scp -1 -B")
+ before.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "backup", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
before.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
+ before.options.hooks = [ PostActionHook("collect", "ls -l"), ]
self.failUnlessRaises(ValueError, before.extractXml, validate=True)
def testExtractXml_012(self):
@@ -10743,8 +10832,9 @@
Extract document containing only a valid options section, validate=False.
"""
before = Config()
- before.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "backup", "/usr/bin/scp -1 -B")
+ before.options = OptionsConfig("tuesday", "/opt/backup/tmp", "backup", "backup", "/usr/bin/scp -1 -B", [], [], "/usr/bin/ssh")
before.options.overrides = [ CommandOverride("mkisofs", "/usr/bin/mkisofs"), CommandOverride("svnlook", "/svnlook"), ]
+ before.options.hooks = [ PostActionHook("collect", "ls -l"), ]
beforeXml = before.extractXml(validate=False)
after = Config(xmlData=beforeXml, validate=False)
self.failUnlessEqual(before, after)
@@ -11168,7 +11258,18 @@
after = Config(xmlData=beforeXml, validate=True)
self.failUnlessEqual(before, after)
+ def testExtractXml_041(self):
+ """
+ Extract complete document containing all required and optional fields,
+ using a peers configuration section, validate=True.
+ """
+ path = self.resources["cback.conf.21"]
+ before = Config(xmlPath=path, validate=True)
+ beforeXml = before.extractXml(validate=True)
+ after = Config(xmlData=beforeXml, validate=True)
+ self.failUnlessEqual(before, after)
+
#######################################################################
# Suite definition
#######################################################################
Modified: cedar-backup2/trunk/test/data/cback.conf.15
===================================================================
--- cedar-backup2/trunk/test/data/cback.conf.15 2007-12-15 21:12:36 UTC (rev 808)
+++ cedar-backup2/trunk/test/data/cback.conf.15 2007-12-15 21:40:44 UTC (rev 809)
@@ -28,6 +28,7 @@
<backup_user>backup</backup_user>
<backup_group>group</backup_group>
<rcp_command>/usr/bin/scp -1 -B</rcp_command>
+ <rsh_command>/usr/bin/ssh</rsh_command>
<override>
<command>mkisofs</command>
<abs_path>/usr/bin/mkisofs</abs_path>
Modified: cedar-backup2/trunk/test/data/cback.conf.20
===================================================================
--- cedar-backup2/trunk/test/data/cback.conf.20 2007-12-15 21:12:36 UTC (rev 808)
+++ cedar-backup2/trunk/test/data/cback.conf.20 2007-12-15 21:40:44 UTC (rev 809)
@@ -31,6 +31,7 @@
<backup_user>backup</backup_user>
<backup_group>group</backup_group>
<rcp_command>/usr/bin/scp -1 -B</rcp_command>
+ <rsh_command>/usr/bin/ssh</rsh_command>
<override>
<command>mkisofs</command>
<abs_path>/usr/bin/mkisofs</abs_path>
Modified: cedar-backup2/trunk/test/data/cback.conf.21
===================================================================
--- cedar-backup2/trunk/test/data/cback.conf.21 2007-12-15 21:12:36 UTC (rev 808)
+++ cedar-backup2/trunk/test/data/cback.conf.21 2007-12-15 21:40:44 UTC (rev 809)
@@ -31,6 +31,7 @@
<backup_user>backup</backup_user>
<backup_group>group</backup_group>
<rcp_command>/usr/bin/scp -1 -B</rcp_command>
+ <rsh_command>/usr/bin/ssh</rsh_command>
<override>
<command>mkisofs</command>
<abs_path>/usr/bin/mkisofs</abs_path>
Modified: cedar-backup2/trunk/test/data/cback.conf.6
===================================================================
--- cedar-backup2/trunk/test/data/cback.conf.6 2007-12-15 21:12:36 UTC (rev 808)
+++ cedar-backup2/trunk/test/data/cback.conf.6 2007-12-15 21:40:44 UTC (rev 809)
@@ -7,6 +7,7 @@
<backup_user>backup</backup_user>
<backup_group>group</backup_group>
<rcp_command>/usr/bin/scp -1 -B</rcp_command>
+ <rsh_command>/usr/bin/ssh</rsh_command>
<override>
<command>mkisofs</command>
<abs_path>/usr/bin/mkisofs</abs_path>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
