Author: svn-role
Date: Wed May 15 04:01:24 2013
New Revision: 1482668
URL: http://svn.apache.org/r1482668
Log:
Merge the r1482554 group from trunk:
* r1482554, r1482592
Making ctypes-python tests pass regardless of local timezone.
Justification:
Tests should not give false negatives.
Notes:
Bindings change so can go into 1.8.0.
Votes:
+1: breser, danielsh
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/bindings/ctypes-python/test/svntypes.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1482554,1482592
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482668&r1=1482667&r2=1482668&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 15 04:01:24 2013
@@ -103,12 +103,3 @@ Approved changes:
# that would restart the soak should not be added unless they are resolving
# blocking issues. If in doubt see this link for details:
#
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-
- * r1482554, r1482592
- Making ctypes-python tests pass regardless of local timezone.
- Justification:
- Tests should not give false negatives.
- Notes:
- Bindings change so can go into 1.8.0.
- Votes:
- +1: breser, danielsh
Modified:
subversion/branches/1.8.x/subversion/bindings/ctypes-python/test/svntypes.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/ctypes-python/test/svntypes.py?rev=1482668&r1=1482667&r2=1482668&view=diff
==============================================================================
---
subversion/branches/1.8.x/subversion/bindings/ctypes-python/test/svntypes.py
(original)
+++
subversion/branches/1.8.x/subversion/bindings/ctypes-python/test/svntypes.py
Wed May 15 04:01:24 2013
@@ -35,7 +35,8 @@ class SvnDateTestCase(unittest.TestCase)
def test_as_human_string(self):
d1 = SvnDate('1999-12-31T23:59:59.000000Z')
s1 = d1.as_human_string()
- self.assertEqual(s1[:27], '1999-12-31 23:59:59 +0000 (')
+ self.assertRegexpMatches(s1[:27],
+ r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [+-]\d{4} \(')
class HashTestCase(unittest.TestCase):
