Merge lp:~fwereade/pyjuju/old-twisted-test-fix into lp:pyjuju

[William Reade]

Tests were not expecting to run against pre-VerifyingContextFactory twisted

https://codereview.appspot.com/5970089/

[William Reade (fwereade)]

Reviewers: mp+101508_code.launchpad.net,

Message:
Please take a look.

Description:
Tests were not expecting to run against pre-VerifyingContextFactory
twisted

https://code.launchpad.net/~fwereade/juju/old-twisted-test-fix/+merge/101508

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/5970089/

Affected files:
   A [revision details]
   M juju/providers/ec2/tests/test_utils.py
   M juju/providers/ec2/utils.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: juju/providers/ec2/utils.py
=== modified file 'juju/providers/ec2/utils.py'
--- juju/providers/ec2/utils.py 2012-04-11 00:09:41 +0000
+++ juju/providers/ec2/utils.py 2012-04-11 08:36:43 +0000
@@ -97,11 +97,12 @@
                  return tokens[7]
          raise LookupError((series, arch, region))

+ uri = _CURRENT_IMAGE_URI_TEMPLATE % (_CURRENT_IMAGE_HOST, series)
      if ssl and ssl_verify:
          contextFactory=VerifyingContextFactory(_CURRENT_IMAGE_HOST)
      else:
          contextFactory=None
- d = getPage(_CURRENT_IMAGE_URI_TEMPLATE % (_CURRENT_IMAGE_HOST,
series), contextFactory=contextFactory)
+ d = getPage(uri, contextFactory=contextFactory)
      d.addErrback(handle_404)
      d.addCallback(extract_ami)
      return d

Index: juju/providers/ec2/tests/test_utils.py
=== modified file 'juju/providers/ec2/tests/test_utils.py'
--- juju/providers/ec2/tests/test_utils.py 2012-04-11 00:09:41 +0000
+++ juju/providers/ec2/tests/test_utils.py 2012-04-11 08:19:44 +0000
@@ -116,9 +116,11 @@
          """

          def match_context(value):
- if isinstance(value, VerifyingContextFactory):
- return True
- return False
+ if VerifyingContextFactory is None:
+ # We're running against an older twisted version without
+ # certificate verification.
+ return value is None
+ return isinstance(value, VerifyingContextFactory)

          page = self.mocker.replace("twisted.web.client.getPage")
          page(IMAGE_URI_TEMPLATE % "lucid",

[Kapil Thangavelu (hazmat)]

trivial, lgtm

review: Approve

[lp:~fwereade/pyjuju/old-twisted-test-fix]

523. By William Reade on 2012-04-11

merge parent

[William Reade (fwereade)]

*** Submitted:

Tests were not expecting to run against pre-VerifyingContextFactory
twisted

R=
CC=
https://codereview.appspot.com/5970089

https://codereview.appspot.com/5970089/

=== modified file 'juju/providers/ec2/tests/test_utils.py'
--- juju/providers/ec2/tests/test_utils.py	2012-04-11 00:09:41 +0000
+++ juju/providers/ec2/tests/test_utils.py	2012-04-11 13:16:25 +0000
@@ -116,9 +116,11 @@
         """
 
         def match_context(value):
-            if isinstance(value, VerifyingContextFactory):
-                return True
-            return False
+            if VerifyingContextFactory is None:
+                # We're running against an older twisted version without
+                # certificate verification.
+                return value is None
+            return isinstance(value, VerifyingContextFactory)
 
         page = self.mocker.replace("twisted.web.client.getPage")
         page(IMAGE_URI_TEMPLATE % "lucid",

=== modified file 'juju/providers/ec2/utils.py'
--- juju/providers/ec2/utils.py	2012-04-11 00:09:41 +0000
+++ juju/providers/ec2/utils.py	2012-04-11 13:16:25 +0000
@@ -97,11 +97,12 @@
                 return tokens[7]
         raise LookupError((series, arch, region))
 
+    uri = _CURRENT_IMAGE_URI_TEMPLATE % (_CURRENT_IMAGE_HOST, series)
     if ssl and ssl_verify:
         contextFactory=VerifyingContextFactory(_CURRENT_IMAGE_HOST)
     else:
         contextFactory=None
-    d = getPage(_CURRENT_IMAGE_URI_TEMPLATE % (_CURRENT_IMAGE_HOST, series), contextFactory=contextFactory)
+    d = getPage(uri, contextFactory=contextFactory)
     d.addErrback(handle_404)
     d.addCallback(extract_ami)
     return d