bug 1026827: Support /update/1/ requests. r=nthomas

auslib/test/web/test_client.py

@@ -175,15 +175,8 @@ def testDontDecreaseVersion(self):
         self.assertEqual(ret.mimetype, 'text/xml')
         self.assertEqual(minidom.parseString(ret.data).getElementsByTagName('updates')[0].firstChild.nodeValue, '\n')
 
-    def testVersion3Get(self):
-        ret = self.client.get('/update/3/a/1.0/1/a/a/a/a/a/a/update.xml')
-        self.assertEqual(ret.status_code, 200)
-        self.assertEqual(ret.mimetype, 'text/xml')
-        # An empty update contains an <updates> tag with a newline, which is what we're expecting here
-        self.assertEqual(minidom.parseString(ret.data).getElementsByTagName('updates')[0].firstChild.nodeValue, '\n')
-
-    def testVersion3GetWithUpdate(self):
-        ret = self.client.get('/update/3/b/1.0/1/p/l/a/a/a/a/update.xml')
+    def testVersion1Get(self):
+        ret = self.client.get("/update/1/b/1.0/1/p/l/a/update.xml")
         self.assertEqual(ret.status_code, 200)
         self.assertEqual(ret.mimetype, 'text/xml')
         # We need to load and re-xmlify these to make sure we don't get failures due to whitespace differences.
@@ -219,6 +212,28 @@ def testVersion2GetIgnoresRuleWithDistribution(self):
         # We need to load and re-xmlify these to make sure we don't get failures due to whitespace differences.
         self.assertEqual(minidom.parseString(ret.data).getElementsByTagName('updates')[0].firstChild.nodeValue, '\n')
 
+    def testVersion3Get(self):
+        ret = self.client.get('/update/3/a/1.0/1/a/a/a/a/a/a/update.xml')
+        self.assertEqual(ret.status_code, 200)
+        self.assertEqual(ret.mimetype, 'text/xml')
+        # An empty update contains an <updates> tag with a newline, which is what we're expecting here
+        self.assertEqual(minidom.parseString(ret.data).getElementsByTagName('updates')[0].firstChild.nodeValue, '\n')
+
+    def testVersion3GetWithUpdate(self):
+        ret = self.client.get('/update/3/b/1.0/1/p/l/a/a/a/a/update.xml')
+        self.assertEqual(ret.status_code, 200)
+        self.assertEqual(ret.mimetype, 'text/xml')
+        # We need to load and re-xmlify these to make sure we don't get failures due to whitespace differences.
+        returned = minidom.parseString(ret.data)
+        expected = minidom.parseString("""<?xml version="1.0"?>
+<updates>
+    <update type="minor" version="1.0" extensionVersion="1.0" buildID="2">
+        <patch type="complete" URL="http://a.com/z" hashFunction="sha512" hashValue="4" size="3"/>
+    </update>
+</updates>
+""")
+        self.assertEqual(returned.toxml(), expected.toxml())
+
     def testVersion4Get(self):
         ret = self.client.get('/update/4/b/1.0/1/p/l/a/a/a/a/1/update.xml')
         self.assertEqual(ret.status_code, 200)

auslib/web/base.py

@@ -41,6 +41,15 @@ def generic(error):
 def robots():
     return send_from_directory(app.static_folder, "robots.txt")
 
+app.add_url_rule(
+    "/update/1/<product>/<version>/<buildID>/<buildTarget>/<locale>/<channel>/update.xml",
+    view_func=ClientRequestView.as_view("clientrequest1"),
+    # Underlying code depends on osVersion being set. Since this route only
+    # exists to support ancient queries, and all newer versions have osVersion
+    # in them it's easier to set this here than make the all of the underlying
+    # code support queries without it.
+    defaults={"queryVersion": 2, "osVersion": ""},
+)
 app.add_url_rule(
     '/update/2/<product>/<version>/<buildID>/<buildTarget>/<locale>/<channel>/<osVersion>/update.xml',
     view_func=ClientRequestView.as_view('clientrequest2'),