Merge in master.

2017-03-05 09:58:39 -05:00 · 2017-03-05 09:58:39 -05:00 · 3b4ef2cf15
commit 3b4ef2cf15
parent d530bcf4a7 0393c384ad
26 changed files with 565 additions and 65 deletions
--- a/moto/sqs/models.py
+++ b/moto/sqs/models.py
@ -183,9 +183,8 @@ class Queue(object):
                self, camelcase_to_underscores(attribute))
        return result

-    @property
-    def url(self):
-        return "http://sqs.{0}.amazonaws.com/123456789012/{1}".format(self.region, self.name)
+    def url(self, request_url):
+        return "{0}://{1}/123456789012/{2}".format(request_url.scheme, request_url.netloc, self.name)

    @property
    def messages(self):