Merge lp:~cjwatson/storm/doctest-cleanup into lp:storm

[Colin Watson]

Clean up a bit more carefully in doctests.

This avoids problems if they're run in a different order.

[Ioana Lasc (ilasc)]

LGTM

review: Approve

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'storm/tests/infoheritance.txt'
--- storm/tests/infoheritance.txt	2019-08-12 17:07:08 +0000
+++ storm/tests/infoheritance.txt	2020-05-26 10:10:15 +0000
@@ -277,4 +277,8 @@
 implemented using inheritance.
 
 
+==== Clean up ====
+
+    >>> Person._storm_property_registry.clear()
+
 ## vim:ts=4:sw=4:et:ft=moin1_5
 
=== modified file 'storm/tests/tutorial.txt'
--- storm/tests/tutorial.txt	2019-08-12 17:07:08 +0000
+++ storm/tests/tutorial.txt	2020-05-26 10:10:15 +0000
@@ -958,4 +958,9 @@
 list.
 
 
+==== Clean up ====
+
+    >>> Currency._storm_property_registry.clear()
+    >>> Country._storm_property_registry.clear()
+
 ## vim:ts=4:sw=4:et:ft=moin1_5
 
=== modified file 'storm/tests/zope/README.txt'
--- storm/tests/zope/README.txt	2020-05-19 09:02:51 +0000
+++ storm/tests/zope/README.txt	2020-05-26 10:10:15 +0000
@@ -342,6 +342,9 @@
 The End
 -------
 
+  >>> Team._storm_property_registry.clear()
+  >>> TeamMembership._storm_property_registry.clear()
+  >>> Person._storm_property_registry.clear()
   >>> transaction.abort()
   >>> zstorm._reset()