From 98cc71d5c93e2de134bf5492f85e2a8ea32a2814 Mon Sep 17 00:00:00 2001 From: Daniel DiPaolo Date: Tue, 17 Feb 2004 04:49:00 +0000 Subject: [PATCH] Fixed quoting issues (permanently, I hope) in the tests. --- test/test_MoobotFactoids.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/test_MoobotFactoids.py b/test/test_MoobotFactoids.py index d8296b099..f3b068967 100644 --- a/test/test_MoobotFactoids.py +++ b/test/test_MoobotFactoids.py @@ -208,28 +208,28 @@ if sqlite is not None: self.assertError('most popular') self.assertResponse('most authored', 'Most prolific author: moo (1)') - self.assertResponse('most recent', "1 latest factoid: 'moogle'") + self.assertRegexp('most recent', "1 latest factoid:.*moogle") self.assertResponse('moogle', 'moo') - self.assertResponse('most popular', - "Top 1 requested factoid: 'moogle' (1)") + self.assertRegexp('most popular', + "Top 1 requested factoid:.*moogle.*(1)") # Check plural response self.prefix = userPrefix2 self.assertNotError('mogle is mo') - self.assertResponse('most authored', - 'Most prolific authors: moo (1) and boo (1)') - self.assertResponse('most recent', - "2 latest factoids: 'mogle' and 'moogle'") + self.assertRegexp('most authored', + 'Most prolific authors:.*moo.*(1).*boo.*(1)') + self.assertRegexp('most recent', + "2 latest factoids:.*mogle.*moogle.*") self.assertResponse('moogle', 'moo') - self.assertResponse('most popular', - "Top 1 requested factoid: 'moogle' (2)") + self.assertRegexp('most popular', + "Top 1 requested factoid:.*moogle.*(2)") self.assertResponse('mogle', 'mo') - self.assertResponse('most popular', - "Top 2 requested factoids: " - "'moogle' (2) and 'mogle' (1)") + self.assertRegexp('most popular', + "Top 2 requested factoids:.*" + "moogle.*(2).*mogle.*(1)") # Check most author ordering self.assertNotError('moo is oom') - self.assertResponse('most authored', - 'Most prolific authors: boo (2) and moo (1)') + self.assertRegexp('most authored', + 'Most prolific authors:.*boo.*(2).*moo.*(1)') def testListkeys(self): self.assertResponse('listkeys %', 'No keys matching "%" found.')