Merge branch 'master' into 0.10

This commit is contained in:
Maximilian Hils
2013-08-17 13:30:36 +02:00
53 changed files with 560 additions and 455 deletions

View File

@@ -107,6 +107,12 @@ class TestDumpMaster:
def test_filter(self):
assert not "GET" in self._dummy_cycle(1, "~u foo", "", verbosity=1)
def test_app(self):
o = dump.Options(app=True)
s = mock.MagicMock()
m = dump.DumpMaster(s, o, None)
assert s.apps.add.call_count == 2
def test_replacements(self):
o = dump.Options(replacements=[(".*", "content", "foo")])
m = dump.DumpMaster(None, o, None)