bug: Simplify ID check and test it

crobinso · crobinso · commit 7a6570f4d4ec · 2014-04-21T10:28:36.000-04:00
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -40,9 +40,6 @@ def __init__(self, bugzilla, bug_id=None, dict=None, autorefresh=True):
             log.debug("Bug(%s)", sorted(dict.keys()))
             self._update_dict(dict)
 
-        if not hasattr(self, 'id'):
-            raise TypeError("Bug object needs a bug_id")
-
         self.weburl = bugzilla.url.replace('xmlrpc.cgi',
                                            'show_bug.cgi?id=%i' % self.bug_id)
 
@@ -86,11 +83,6 @@ def __getattr__(self, name):
             if refreshed:
                 break
 
-            if 'id' not in self.__dict__:
-                # This is fatal, since we have no ID to pass to refresh()
-                # Can happen if a messed up include_fields is passed to query
-                raise AttributeError("No bug ID cached for bug object")
-
             log.info("Bug %i missing attribute '%s' - doing implicit "
                 "refresh(). This will be slow, if you want to avoid "
                 "this, properly use query/getbug include_fields.",
@@ -139,6 +131,9 @@ def _update_dict(self, newdict):
                 self._bug_fields.append(key)
         self.__dict__.update(newdict)
 
+        if 'id' not in self.__dict__ and 'bug_id' not in self.__dict__:
+            raise TypeError("Bug object needs a bug_id")
+
 
     ##################
     # pickle helpers #
diff --git a/tests/bug.py b/tests/bug.py
@@ -63,3 +63,10 @@ def _assert_bug():
         self.assertEqual(getattr(bug, "bugzilla"), None)
         bug.bugzilla = self.bz
         _assert_bug()
+
+    def testBugNoID(self):
+        try:
+            _Bug(bugzilla=self.bz, dict={"component": "foo"})
+            raise AssertionError("Expected lack of ID failure.")
+        except TypeError:
+            pass
