Merge lp:~mfisch/ubuntu-community-accomplishments/lp1092312 into lp:ubuntu-community-accomplishments

[Matt Fischer]

Fix the test error by not assuming the list has data, run pep8, and remove an unused import. Also fix the test failure for askubuntu-quorum.

[lp:~mfisch/ubuntu-community-accomplishments/lp1092312]

249. By Matt Fischer on 2012-12-24

also fix the test failure for askubuntu-quorum

Unmerged revisions

249. By Matt Fischer on 2012-12-24

also fix the test failure for askubuntu-quorum

248. By Matt Fischer on 2012-12-24

fixing the battery failure for registered on askubuntu, also ran pep8 on it and removed unused import

=== modified file 'Changelog'
--- Changelog	2012-12-23 21:50:29 +0000
+++ Changelog	2012-12-24 05:22:21 +0000
@@ -21,8 +21,10 @@
    [Howard Chan]
    * New accomplishment: Testcase Admins
    * New accomplishment: First Bug Fixed
-   * Changed all accomplishments with name="Sliver Fox" to "s.fox" to avoid duplicates (LP: #1080346)
-   * Fixed the Testcase Admins Accomplishments test file to fix the failing tests (LP: #1092310)
+   * Changed all accomplishments with name="Sliver Fox" to "s.fox" to avoid
+   duplicates (LP: #1080346)
+   * Fixed the Testcase Admins Accomplishments test file to fix the failing 
+   tests (LP: #1092310)
  
    [Daniel Ejsing-Duun]
    * New accomplishment: Chat on IRC
@@ -32,4 +34,8 @@
 
    [Philip Ballew]
    * New accomplishment: Youth Council Member
+
+   [Matthew Fischer]
+   * Fixed a bug in the registered-on-askubuntu script that caused a test
+   failure (LP: #1092312)
 -------------------------------------------------------------------------

=== modified file 'scripts/ubuntu-community/support/registered-on-askubuntu.py'
--- scripts/ubuntu-community/support/registered-on-askubuntu.py	2012-08-01 19:22:31 +0000
+++ scripts/ubuntu-community/support/registered-on-askubuntu.py	2012-12-24 05:22:21 +0000
@@ -1,15 +1,16 @@
 #!/usr/bin/python
-import traceback, sys
+import traceback
+import sys
 import json
 import gzip
-import simplejson
 import urllib2
 import StringIO
 from accomplishments.daemon import dbusapi
 
 try:
     api = dbusapi.Accomplishments()
-    userurl = api.get_extra_information("ubuntu-community", "askubuntu-user-url")
+    userurl = api.get_extra_information(
+        "ubuntu-community", "askubuntu-user-url")
     if bool(userurl[0]["askubuntu-user-url"]) == False:
         sys.exit(1)
     else:
@@ -30,7 +31,11 @@
 
     user_raw = gzipr.read()
     user_data = json.loads(user_raw)
-    user_type = user_data['items'][0]['user_type']
+    items = user_data['items']
+    if not items:
+        sys.exit(1)
+    else:
+        user_type = items[0]['user_type']
 
     if user_type == 'registered' or user_type == 'moderator':
         sys.exit(0)
@@ -45,5 +50,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-
-

=== modified file 'tests/ubuntu-community/support/askubuntu-quorum'
--- tests/ubuntu-community/support/askubuntu-quorum	2012-05-30 17:51:37 +0000
+++ tests/ubuntu-community/support/askubuntu-quorum	2012-12-24 05:22:21 +0000
@@ -1,5 +1,5 @@
 [success]
-askubuntu-user-url = http://askubuntu.com/users/66563/adrian
+askubuntu-user-url = http://askubuntu.com/users/73/mfisch
 
 [failure]
 askubuntu-user-url = http://askubuntu.com/users/67229/accomplishmentsvalid