Merge lp:~msabramo/capturemock/tests_add_mutable_mapping_replay into lp:~geoff.bache/capturemock/tests

[Marc Abramowitz]

Hi Geoff,

So the fixes we did fixed **recording** of collections.MutableMapping objects, but unfortunately **replay** is still broken with the same metaclass error.

Here is a TextTest test that shows it.

[Geoff Bache (geoff.bache)]

Thanks for this, I've merged it. This time, the main change was to move several copied files to the parent directory and remove the copies: TextTest works hierarchically like this to avoid duplicating data.

Might have known we'd need a replay test for this, really. I'll take a look now.

=== added directory 'python_attributes/objects/mutable_mapping/record'
=== renamed file 'python_attributes/objects/mutable_mapping/catalogue.cpmock' => 'python_attributes/objects/mutable_mapping/record/catalogue.cpmock'
=== renamed file 'python_attributes/objects/mutable_mapping/knownbugs.cpmock' => 'python_attributes/objects/mutable_mapping/record/knownbugs.cpmock'
=== renamed file 'python_attributes/objects/mutable_mapping/moduletomock.py' => 'python_attributes/objects/mutable_mapping/record/moduletomock.py'
=== renamed file 'python_attributes/objects/mutable_mapping/recorded_mock.cpmock' => 'python_attributes/objects/mutable_mapping/record/recorded_mock.cpmock'
=== renamed file 'python_attributes/objects/mutable_mapping/stderr.cpmock' => 'python_attributes/objects/mutable_mapping/record/stderr.cpmock'
=== renamed file 'python_attributes/objects/mutable_mapping/stdout.cpmock' => 'python_attributes/objects/mutable_mapping/record/stdout.cpmock'
=== renamed file 'python_attributes/objects/mutable_mapping/target.py' => 'python_attributes/objects/mutable_mapping/record/target.py'
=== added directory 'python_attributes/objects/mutable_mapping/replay'
=== added directory 'python_attributes/objects/mutable_mapping/replay/capturemock'
=== added file 'python_attributes/objects/mutable_mapping/replay/capturemock/test.mock'
--- python_attributes/objects/mutable_mapping/replay/capturemock/test.mock	1970-01-01 00:00:00 +0000
+++ python_attributes/objects/mutable_mapping/replay/capturemock/test.mock	2013-12-11 06:05:46 +0000
@@ -0,0 +1,7 @@
+<-PYT:import moduletomock
+<-PYT:moduletomock.__path__
+->RET:raise exceptions.AttributeError("'module' object has no attribute '__path__'")
+<-PYT:moduletomock.MyDict(animal='dog')
+->RET:Instance('MyDict(_abcoll.MutableMapping)', 'mydict_dog')
+<-PYT:mydict_dog.__getitem__('animal')
+->RET:'dog'

=== added file 'python_attributes/objects/mutable_mapping/replay/catalogue.cpmock'
--- python_attributes/objects/mutable_mapping/replay/catalogue.cpmock	1970-01-01 00:00:00 +0000
+++ python_attributes/objects/mutable_mapping/replay/catalogue.cpmock	2013-12-11 06:05:46 +0000
@@ -0,0 +1,1 @@
+No files or directories were created, edited or deleted.

=== added file 'python_attributes/objects/mutable_mapping/replay/knownbugs.cpmock'
--- python_attributes/objects/mutable_mapping/replay/knownbugs.cpmock	1970-01-01 00:00:00 +0000
+++ python_attributes/objects/mutable_mapping/replay/knownbugs.cpmock	2013-12-11 06:05:46 +0000
@@ -0,0 +1,8 @@
+
+[Reported by geoff at 08Dec22:13:21]
+search_string:metaclass conflict: the metaclass of a derived clas
+use_regexp:0
+search_file:stderr
+ignore_other_errors:1
+full_description:No support for intercepting objects derived from Abstract Base Classes currently. See LP bug 1256218
+brief_description:LP bug 1256218

=== added file 'python_attributes/objects/mutable_mapping/replay/moduletomock.py'
--- python_attributes/objects/mutable_mapping/replay/moduletomock.py	1970-01-01 00:00:00 +0000
+++ python_attributes/objects/mutable_mapping/replay/moduletomock.py	2013-12-11 06:05:46 +0000
@@ -0,0 +1,15 @@
+from collections import MutableMapping
+
+class MyDict(MutableMapping):
+    def __init__(self, **kwargs):
+        self._dict = dict(kwargs)
+    def __delitem__(self):
+        del self._dict[key]
+    def __getitem__(self, key):
+        return self._dict[key]
+    def __setitem__(self, key, val):
+        self._dict[key] = val
+    def __iter__(self):
+        return iter(self._dict)
+    def __len__(self):
+        return len(self._dict)

=== added file 'python_attributes/objects/mutable_mapping/replay/stderr.cpmock'
=== added file 'python_attributes/objects/mutable_mapping/replay/stdout.cpmock'
--- python_attributes/objects/mutable_mapping/replay/stdout.cpmock	1970-01-01 00:00:00 +0000
+++ python_attributes/objects/mutable_mapping/replay/stdout.cpmock	2013-12-11 06:05:46 +0000
@@ -0,0 +1,1 @@
+mutable_mapping["animal"] = 'dog'

=== added file 'python_attributes/objects/mutable_mapping/replay/target.py'
--- python_attributes/objects/mutable_mapping/replay/target.py	1970-01-01 00:00:00 +0000
+++ python_attributes/objects/mutable_mapping/replay/target.py	2013-12-11 06:05:46 +0000
@@ -0,0 +1,11 @@
+from capturemock import capturemock, REPLAY
+
+@capturemock('moduletomock', mode=REPLAY)
+def test():
+    from moduletomock import MyDict
+
+    mutable_mapping = MyDict(animal='dog')
+
+    print('mutable_mapping["animal"] = %r' % mutable_mapping["animal"])
+
+test()

=== added file 'python_attributes/objects/mutable_mapping/testsuite.cpmock'
--- python_attributes/objects/mutable_mapping/testsuite.cpmock	1970-01-01 00:00:00 +0000
+++ python_attributes/objects/mutable_mapping/testsuite.cpmock	2013-12-11 06:05:46 +0000
@@ -0,0 +1,2 @@
+record
+replay