1 files changed, 70 insertions, 0 deletions
diff --git a/cpp/test/IceStorm/persistent/test.py b/cpp/test/IceStorm/persistent/test.py
new file mode 100644
index 00000000000..291f457cc40
--- /dev/null
+++ b/cpp/test/IceStorm/persistent/test.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# **********************************************************************
+#
+# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+icestorm1 = IceStorm(createDb=True, cleanDb=False)
+icestorm2 = IceStorm(createDb=False, cleanDb=True)
+
+
+def test(value):
+    if not value:
+        raise RuntimeError("test failed")
+
+
+class IceStormPersistentTestCase(TestCase):
+
+    def __init__(self, name, icestorm, *args, **kargs):
+        TestCase.__init__(self, name, *args, **kargs)
+        self.icestorm = icestorm
+
+    def init(self, mapping, testsuite):
+        TestCase.init(self, mapping, testsuite)
+        self.servers = [self.icestorm]
+
+    def runWithDriver(self, current):
+        current.driver.runClientServerTestCase(current)
+
+    def teardownClientSide(self, current, success):
+        admin = IceStormAdmin(instance=self.icestorm, quiet=True,
+                              args=["-e", "topics {}".format(self.icestorm.getInstanceName())])
+        admin.run(current, exitstatus=0)
+        #
+        # Ensure all topics have been restored from the storage
+        #
+        topics = admin.getOutput(current).split()
+        test(len(topics) == 10)
+        for i in range(0, 10):
+            topic = topics[i]
+            admin = IceStormAdmin(instance=self.icestorm, quiet=True,
+                                  args=["-e",
+                                        "current {0};subscribers {1}".format(self.icestorm.getInstanceName(), topic)])
+            admin.run(current, exitstatus=0)
+            subscribers = admin.getOutput(current).split()[2:]
+            test("subscriber{0}".format(i) in subscribers)
+            if i > 0:
+                test("IceStorm/topic.topic{0}".format(i - 1) in subscribers)
+
+        self.icestorm.shutdown(current)
+
+class PersistentClient(IceStormProcess, Client):
+
+    processType = "client"
+
+    def __init__(self, instanceName=None, instance=None, *args, **kargs):
+        Client.__init__(self, *args, **kargs)
+        IceStormProcess.__init__(self, instanceName, instance)
+
+    getParentProps = Client.getProps # Used by IceStormProcess to get the client properties
+
+TestSuite(__file__, [
+    IceStormPersistentTestCase("persistent create", icestorm1,
+                               client=ClientTestCase(client=PersistentClient(instance=icestorm1, args=["create"]))),
+    IceStormPersistentTestCase("persistent check", icestorm2,
+                               client=ClientTestCase(client=PersistentClient(instance=icestorm2, args=["check"]))),
+], multihost=False)