Add some basic testing for NovellBugzilla

crobinso · crobinso · commit c7431f484459 · 2013-01-31T15:50:32.000-05:00
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -32,6 +32,10 @@ def getBugzillaClassForURL(url):
     bzversion = ''
     c = None
 
+    if url.count("novell.com"):
+        logging.debug("Detected Novell bugzilla based on novell.com")
+        return NovellBugzilla
+
     # Check for a Red Hat extension
     try:
         log.debug("Checking for Red Hat Bugzilla extension")
@@ -44,7 +48,7 @@ def getBugzillaClassForURL(url):
 
     # Try to get the bugzilla version string
     try:
-        log.debug("Checking return value of Buzilla.version()")
+        log.debug("Checking return value of Bugzilla.version()")
         r = s.Bugzilla.version()
         bzversion = r['version']
     except xmlrpclib.Fault:
diff --git a/bugzilla/nvlbugzilla.py b/bugzilla/nvlbugzilla.py
@@ -17,10 +17,10 @@
 import urllib2
 import urlparse
 
-from bugzilla import BugzillaError, Bugzilla32, log
+from bugzilla import BugzillaError, Bugzilla34, log
 
 
-class NovellBugzilla(Bugzilla32):
+class NovellBugzilla(Bugzilla34):
     '''
     bugzilla.novell.com is a standard bugzilla 3.2 with some extensions, but
     it uses an proprietary and non-standard IChain login system. This class
diff --git a/tests/ro_functional.py b/tests/ro_functional.py
@@ -164,6 +164,27 @@ class BZ42(BaseTest):
                 "3450 daniel@fooishbar.org Error")
 
 
+class NovellBugzilla(BaseTest):
+    url = "https://bugzilla.novell.com/xmlrpc.cgi"
+    bzclass = bugzilla.NovellBugzilla
+
+    test0 = BaseTest._testBZClass
+
+    test1 = lambda s: BaseTest._testQuery(s,
+            "--product \"openSUSE 11.0\" --component Basesystem",
+            15, "83209")
+
+    def testLoginFail(self):
+        # Currently gives a 404 error, so something is busted.
+        # However if I drop all the custom stuff plain ol BZ login works
+        bz = self.bzclass(url=self.url, cookiefile=None)
+        try:
+            bz.login("foouser", "barpassword")
+            raise AssertionError("Expected novell login fail")
+        except Exception, e:
+            self.assertTrue("404" in str(e))
+
+
 class RHTest(BaseTest):
     url = "https://bugzilla.redhat.com/xmlrpc.cgi"
     bzclass = bugzilla.RHBugzilla
