Merge pull request #89 from w3c/jgraham/manifest_rebuild

Update the manifest file when a version mismatch occurs
web-platform-tests · Mar 12, 2015 · cd49e9e · cd49e9e
2 parents a86ab86 + 517c661
commit cd49e9e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/wptrunner/testloader.py b/wptrunner/testloader.py
@@ -255,9 +255,13 @@ def update_manifest(self, manifest_path, tests_path, url_base="/",
         if not json_data:
             manifest_file = manifest.Manifest(None, url_base)
         else:
-            manifest_file = manifest.Manifest.from_json(tests_path, json_data)
+            try:
+                manifest_file = manifest.Manifest.from_json(tests_path, json_data)
+            except manifest.ManifestVersionMismatch:
+                manifest_file = manifest.Manifest(None, url_base)
+
+            manifest_update.update(tests_path, url_base, manifest_file)
 
-        manifest_update.update(tests_path, url_base, manifest_file)
         manifest.write(manifest_file, manifest_path)
 
     def load_manifest(self, tests_path, metadata_path, url_base="/"):