Accept dash suffixes in languages-target versions (bug 1185930)

mozilla · Sep 15, 2015 · aac7d5b · aac7d5b
1 parent fd2ccf8
commit aac7d5b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 5 deletions.
diff --git a/appvalidator/specs/webapps.py b/appvalidator/specs/webapps.py
@@ -306,8 +306,7 @@ class WebappSpec(Spec):
                     "navigation": {"expected_type": bool},
                 }
             },
-            # For now, we only support languages pack targeting gaia apps and
-            # only with 2.2 version.
+            # At present we only support langpacks targeting Gaia system apps.
             "languages-target": {
                 "expected_type": dict,
                 "process": lambda s: s.process_languages_target,
@@ -318,7 +317,7 @@ class WebappSpec(Spec):
                     "app://*.gaiamobile.org/manifest.webapp": {
                         "expected_type": types.StringTypes,
                         "not_empty": True,
-                        "values": ["2.2", "3.0"]
+                        "value_matches": r"\d+.\d+(?:-\w+)?"
                     },
                 }
             },

diff --git a/tests/test_webapp.py b/tests/test_webapp.py
@@ -199,6 +199,50 @@ def test_langpack_role_need_languages_target(self):
         self.assert_failed(with_errors=True)
         self.assert_got_errid(("spec", "iterate", "missing_req_cond", ))
 
+    def test_langpack_languages_target_version_value(self):
+        """Test that language-target version is in major.minor format."""
+        self.resources.append(('packaged', True))
+        self.data.update({
+            "role": "langpack",
+            "languages-target": {
+                "app://*.gaiamobile.org/manifest.webapp": "2.5"
+            },
+            "languages-provided": {
+                "de": {
+                    "name": "Deutsch",
+                    "revision": 201411051234,
+                    "apps": {
+                      "app://blah.gaiamobile.org/manifest.webapp": "/de/blah",
+                      "app://email.gaiamobile.org/manifest.webapp": "/de/email"
+                    }
+                }
+            },
+        })
+        self.analyze()
+        self.assert_silent()
+
+    def test_langpack_languages_target_version_value_suffix(self):
+        """Test that language-target version can have a dash suffix."""
+        self.resources.append(('packaged', True))
+        self.data.update({
+            "role": "langpack",
+            "languages-target": {
+                "app://*.gaiamobile.org/manifest.webapp": "2.5-xyz"
+            },
+            "languages-provided": {
+                "de": {
+                    "name": "Deutsch",
+                    "revision": 201411051234,
+                    "apps": {
+                      "app://blah.gaiamobile.org/manifest.webapp": "/de/blah",
+                      "app://email.gaiamobile.org/manifest.webapp": "/de/email"
+                    }
+                }
+            },
+        })
+        self.analyze()
+        self.assert_silent()
+
     def test_langpack_invalid_languages_target_type(self):
         """Test language-target type."""
         self.resources.append(('packaged', True))
@@ -249,7 +293,7 @@ def test_langpack_invalid_languages_target_wrong_version_value(self):
         self.data.update({
             "role": "langpack",
             "languages-target": {
-                "app://*.gaiamobile.org/manifest.webapp": "2.3"  # Wrong value.
+                "app://*.gaiamobile.org/manifest.webapp": "2"  # Wrong value.
             },
             "languages-provided": {
                 "de": {
@@ -264,7 +308,7 @@ def test_langpack_invalid_languages_target_wrong_version_value(self):
         })
         self.analyze()
         self.assert_failed(with_errors=True)
-        self.assert_got_errid(("spec", "iterate", "bad_value", ))
+        self.assert_got_errid(("spec", "iterate", "value_pattern_fail", ))
 
     def test_langpack_invalid_languages_target(self):
         """Test that language-target manifest has the correct value."""