Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-tests into lp:canonical-identity-provider/release

[Simon Davy]

Fix issues in acceptances for new PAPER_DEVICE flag and also quantal's urlparse backport

Fix two small issue's I encountered in the accetpance tests

[Natalia Bidart (nataliabidart)]

The acceptance suite is failing with:

======================================================================
ERROR: test_add_device_google (sst.runtests.TestAdd_Device_Google)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/nessita/canonical/cip/reviews/.env/local/lib/python2.7/site-packages/sst/runtests.py", line 284, in test
    exec self.code in context
  File "/home/nessita/canonical/cip/reviews/identityprovider/tests/acceptance/devices/add_device_google.py", line 37, in <module>
    aes_key = get_key_from_qrcode(email)
  File "/home/nessita/canonical/cip/reviews/identityprovider/tests/acceptance/shared/devices.py", line 176, in get_key_from_qrcode
    b32_key = parse_qs(otpauth.query)['secret'][0]
KeyError: 'secret'

----------------------------------------------------------------------
Ran 1 test in 10.644s

FAILED (errors=1)
----------------------------------------------------------------------

I think that failure is related to the changes done in this branch, so I think it needs some fixing. Please let me know if I need to tweak something else in my env.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'identityprovider/tests/acceptance/devices/add_device.py'
--- identityprovider/tests/acceptance/devices/add_device.py	2012-10-12 18:00:59 +0000
+++ identityprovider/tests/acceptance/devices/add_device.py	2012-10-24 14:35:33 +0000
@@ -1,6 +1,9 @@
 # Test basic device-list page
+import sst
+
 from canonical.isd.tests.sst import config
 from oath import hotp
+
 from sst.actions import (
     assert_element,
     assert_radio_value,
@@ -55,8 +58,10 @@
 assert_radio_value('type_yubi', False)
 assert_radio_value('type_generic', False)
 
-# TODO: change once the pad is added
-fails(assert_radio_value, 'type_paper', False)
+if 'paper_device' in sst.config.flags:
+    assert_radio_value('type_paper', False)
+else:
+    fails(assert_radio_value, 'type_paper', False)
 
 # Choose "Generic HOTP device" and click add device
 set_radio_value('type_generic')

=== modified file 'identityprovider/tests/acceptance/shared/devices.py'
--- identityprovider/tests/acceptance/shared/devices.py	2012-10-12 18:00:59 +0000
+++ identityprovider/tests/acceptance/shared/devices.py	2012-10-24 14:35:33 +0000
@@ -167,12 +167,17 @@
     url = urlparse(src)
     assert url.scheme == 'https', "incorrect google charts protocol"
     assert url.netloc == 'chart.googleapis.com', "incorrect google charts domain"
-    otpauth = urlparse(parse_qs(url.query)['chl'][0])
+    qs = parse_qs(url.query)['chl'][0]
+    otpauth = urlparse(qs)
     assert email in otpauth.path
-
-    # should have form otpauth://hotp/<email>?secrec=<key>&counter=0
-    # but urlparse doesn't correctly parse query strings on non-http schemes :(
-    # so we have to do it manually
-    b32_key = parse_qs(otpauth.path.split('?')[1])['secret'][0]
+    # python2.7.3 on quantal has a backport from 2.7 trunk (presumably will be
+    # 2.7.4) and now urlparse correctly handles query string on *all* url types
+    if otpauth.query:
+        # urlparse has handled query string
+        query = otpauth.query
+    else:
+        # we need to handle query string parsing
+        query = otpauth.path.split('?')[1]
+    b32_key = parse_qs(query)['secret'][0]
     aes_key = b32decode(b32_key).encode('hex')
     return aes_key