[cedar-backup-svn] SF.net SVN: cedar-backup:[1051] cedar-backup2/trunk
Brought to you by:
pronovic
Menu
▾
▴
[cedar-backup-svn] SF.net SVN: cedar-backup:[1051] cedar-backup2/trunk
|
From: <pro...@us...> - 2014-10-01 20:16:07
|
Revision: 1051
http://sourceforge.net/p/cedar-backup/code/1051
Author: pronovic
Date: 2014-10-01 20:16:04 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
Add tests
Modified Paths:
--------------
cedar-backup2/trunk/CedarBackup2/extend/amazons3.py
cedar-backup2/trunk/testcase/amazons3tests.py
cedar-backup2/trunk/testcase/data/amazons3.conf.2
Modified: cedar-backup2/trunk/CedarBackup2/extend/amazons3.py
===================================================================
--- cedar-backup2/trunk/CedarBackup2/extend/amazons3.py 2014-10-01 19:39:24 UTC (rev 1050)
+++ cedar-backup2/trunk/CedarBackup2/extend/amazons3.py 2014-10-01 20:16:04 UTC (rev 1051)
@@ -82,8 +82,8 @@
# Cedar Backup modules
from CedarBackup2.util import resolveCommand, executeCommand, isRunningAsRoot
-from CedarBackup2.xmlutil import createInputDom, addContainerNode, addStringNode
-from CedarBackup2.xmlutil import readFirstChild, readString
+from CedarBackup2.xmlutil import createInputDom, addContainerNode, addBooleanNode, addStringNode
+from CedarBackup2.xmlutil import readFirstChild, readString, readBoolean
from CedarBackup2.actions.util import writeIndicatorFile
from CedarBackup2.actions.constants import DIR_TIME_FORMAT, STAGE_INDICATOR
@@ -340,6 +340,7 @@
We add the following fields to the document::
+ warnMidnite //cb_config/amazons3/warn_midnite
s3Bucket //cb_config/amazons3/s3_bucket
@param xmlDom: DOM tree as from C{impl.createDocument()}.
@@ -347,6 +348,7 @@
"""
if self.amazons3 is not None:
sectionNode = addContainerNode(xmlDom, parentNode, "amazons3")
+ addBooleanNode(xmlDom, sectionNode, "warn_midnite", self.amazons3.warnMidnite)
addStringNode(xmlDom, sectionNode, "s3_bucket", self.amazons3.s3Bucket)
def _parseXmlData(self, xmlData):
@@ -371,6 +373,7 @@
We read the following individual fields::
+ warnMidnite //cb_config/amazons3/warn_midnite
s3Bucket //cb_config/amazons3/s3_bucket
@param parent: Parent node to search beneath.
@@ -382,6 +385,7 @@
section = readFirstChild(parent, "amazons3")
if section is not None:
amazons3 = AmazonS3Config()
+ amazons3.warnMidnite = readBoolean(section, "warn_midnite")
amazons3.s3Bucket = readString(section, "s3_bucket")
return amazons3
Modified: cedar-backup2/trunk/testcase/amazons3tests.py
===================================================================
--- cedar-backup2/trunk/testcase/amazons3tests.py 2014-10-01 19:39:24 UTC (rev 1050)
+++ cedar-backup2/trunk/testcase/amazons3tests.py 2014-10-01 20:16:04 UTC (rev 1051)
@@ -149,20 +149,23 @@
Test constructor with no values filled in.
"""
amazons3 = AmazonS3Config()
+ self.failUnlessEqual(False, amazons3.warnMidnite)
self.failUnlessEqual(None, amazons3.s3Bucket)
def testConstructor_002(self):
"""
Test constructor with all values filled in, with valid values.
"""
- amazons3 = AmazonS3Config("bucket")
+ amazons3 = AmazonS3Config(True, "bucket")
+ self.failUnlessEqual(True, amazons3.warnMidnite)
self.failUnlessEqual("bucket", amazons3.s3Bucket)
def testConstructor_003(self):
"""
Test assignment of s3Bucket attribute, None value.
"""
- amazons3 = AmazonS3Config(s3Bucket="bucket")
+ amazons3 = AmazonS3Config(warnMidnite=True, s3Bucket="bucket")
+ self.failUnlessEqual(True, amazons3.warnMidnite)
self.failUnlessEqual("bucket", amazons3.s3Bucket)
amazons3.s3Bucket = None
self.failUnlessEqual(None, amazons3.s3Bucket)
@@ -185,7 +188,35 @@
self.failUnlessAssignRaises(ValueError, amazons3, "s3Bucket", "")
self.failUnlessEqual(None, amazons3.s3Bucket)
+ def testConstructor_006(self):
+ """
+ Test assignment of warnMidnite attribute, valid value (real boolean).
+ """
+ amazons3 = AmazonS3Config()
+ self.failUnlessEqual(False, amazons3.warnMidnite)
+ amazons3.warnMidnite = True
+ self.failUnlessEqual(True, amazons3.warnMidnite)
+ amazons3.warnMidnite = False
+ self.failUnlessEqual(False, amazons3.warnMidnite)
+ def testConstructor_007(self):
+ """
+ Test assignment of warnMidnite attribute, valid value (expression).
+ """
+ amazons3 = AmazonS3Config()
+ self.failUnlessEqual(False, amazons3.warnMidnite)
+ amazons3.warnMidnite = 0
+ self.failUnlessEqual(False, amazons3.warnMidnite)
+ amazons3.warnMidnite = []
+ self.failUnlessEqual(False, amazons3.warnMidnite)
+ amazons3.warnMidnite = None
+ self.failUnlessEqual(False, amazons3.warnMidnite)
+ amazons3.warnMidnite = ['a']
+ self.failUnlessEqual(True, amazons3.warnMidnite)
+ amazons3.warnMidnite = 3
+ self.failUnlessEqual(True, amazons3.warnMidnite)
+
+
############################
# Test comparison operators
############################
@@ -236,8 +267,8 @@
"""
Test comparison of two differing objects, s3Bucket differs.
"""
- amazons31 = AmazonS3Config("bucket1")
- amazons32 = AmazonS3Config("bucket2")
+ amazons31 = AmazonS3Config(True, "bucket1")
+ amazons32 = AmazonS3Config(True, "bucket2")
self.failIfEqual(amazons31, amazons32)
self.failUnless(not amazons31 == amazons32)
self.failUnless(amazons31 < amazons32)
@@ -246,7 +277,21 @@
self.failUnless(not amazons31 >= amazons32)
self.failUnless(amazons31 != amazons32)
+ def testComparison_005(self):
+ """
+ Test comparison of two differing objects, warnMidnite differs.
+ """
+ amazons31 = AmazonS3Config(warnMidnite=False)
+ amazons32 = AmazonS3Config(warnMidnite=True)
+ self.failIfEqual(amazons31, amazons32)
+ self.failUnless(not amazons31 == amazons32)
+ self.failUnless(amazons31 < amazons32)
+ self.failUnless(amazons31 <= amazons32)
+ self.failUnless(not amazons31 > amazons32)
+ self.failUnless(not amazons31 >= amazons32)
+ self.failUnless(amazons31 != amazons32)
+
########################
# TestLocalConfig class
########################
@@ -414,13 +459,13 @@
def testComparison_004(self):
"""
- Test comparison of two differing objects, s3Bucket differs.
+ Test comparison of two differing objects, s3Bucket differs.
"""
config1 = LocalConfig()
- config1.amazons3 = AmazonS3Config("bucket1")
+ config1.amazons3 = AmazonS3Config(True, "bucket1")
config2 = LocalConfig()
- config2.amazons3 = AmazonS3Config("bucket2")
+ config2.amazons3 = AmazonS3Config(True, "bucket2")
self.failIfEqual(config1, config2)
self.failUnless(not config1 == config2)
@@ -464,7 +509,7 @@
Test validate on a non-empty amazons3 section with valid values filled in.
"""
config = LocalConfig()
- config.amazons3 = AmazonS3Config("bucket")
+ config.amazons3 = AmazonS3Config(True, "bucket")
config.validate()
@@ -493,9 +538,11 @@
contents = open(path).read()
config = LocalConfig(xmlPath=path, validate=False)
self.failIfEqual(None, config.amazons3)
+ self.failUnlessEqual(True, config.amazons3.warnMidnite)
self.failUnlessEqual("mybucket", config.amazons3.s3Bucket)
config = LocalConfig(xmlData=contents, validate=False)
self.failIfEqual(None, config.amazons3)
+ self.failUnlessEqual(True, config.amazons3.warnMidnite)
self.failUnlessEqual("mybucket", config.amazons3.s3Bucket)
@@ -516,7 +563,7 @@
"""
Test with values set.
"""
- amazons3 = AmazonS3Config("bucket")
+ amazons3 = AmazonS3Config(True, "bucket")
config = LocalConfig()
config.amazons3 = amazons3
self.validateAddConfig(config)
Modified: cedar-backup2/trunk/testcase/data/amazons3.conf.2
===================================================================
--- cedar-backup2/trunk/testcase/data/amazons3.conf.2 2014-10-01 19:39:24 UTC (rev 1050)
+++ cedar-backup2/trunk/testcase/data/amazons3.conf.2 2014-10-01 20:16:04 UTC (rev 1051)
@@ -2,6 +2,7 @@
<!-- Valid document -->
<cb_config>
<amazons3>
+ <warn_midnite>Y</warn_midnite>
<s3_bucket>mybucket</s3_bucket>
</amazons3>
</cb_config>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
