Changeset 2928 in products

Timestamp:

Oct 26, 2010 2:34:03 PM (13 years ago)

Author:

mylan

Message:

#233: Update tests for catching errors on keywords calculation

File:

• quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testUsageKeywords.py (modified) (3 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testUsageKeywords.py

@@ -123 +123 @@
         self.assertTrue(self.seo.external_keywords_test)
         # 1. Information about problem must present in check view
-        self.assertTrue("Problem with page retrieval" in self.chckView())
+        msg = self.chckView()
+        rematch = re.match(
+            ".*Problem with page retrieval.*error_log/showEntry\?id=",
+             msg, re.S)
+        self.assertTrue(rematch, "Return message has incomplete information "
+            "about problem with page retrieval: %s" % msg)
         # 2. Opened urllib file descriptor should not be closed because
         #    it even not returned to the view
@@ -138 +143 @@
                 return self.orig_urlopen(*args, **kwargs)
         def patch_read(*args, **kwargs):
-            raise IOError()
+            raise Exception("General exception")
         # Patch urllib2.urlopen to emulate external url retrieval
         self.patchURLLib(fnc=patch_urlopen)
@@ -145 +150 @@
         self.seo._updateProperty("external_keywords_test", True)
         self.assertTrue(self.seo.external_keywords_test)
-        # 1. Information about problem must present in check view
-        self.assertTrue("Problem with page retrieval" in self.chckView())
+        # 1. General exception must be raised.
+        self.assertRaises(Exception, self.chckView)
         # 2. Opened urllib file descriptor must be closed
         self.assertTrue(self.urlfd.closed, "Opened file descriptor was not closed.")