Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@812936 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 0 deletions

diff --git a/qpid/python/tests/datatypes.py b/qpid/python/tests/datatypes.py
index 1a60bb4107..b00e5e78f8 100644
--- a/qpid/python/tests/datatypes.py
+++ b/qpid/python/tests/datatypes.py
@@ -54,6 +54,19 @@ class SerialTest(TestCase):
     d[serial(0)] = "zero"
     assert d[0] == "zero"
 
+  def testAdd(self):
+    assert serial(2) + 2 == serial(4)
+    assert serial(2) + 2 == 4
+
+  def testSub(self):
+    delta = serial(4) - serial(2)
+    assert isinstance(delta, int) or isinstance(delta, long)
+    assert delta == 2
+
+    delta = serial(4) - 2
+    assert isinstance(delta, Serial)
+    assert delta == serial(2)
+
 class RangedSetTest(TestCase):
 
   def check(self, ranges):