Modified metadata updates (for setting updateType) to use preed's new schema type.

Added another case (3rd, default case) to cover legacy behavior, where the data is not passed in the file, and we assume it's a minor.

Added appropriate synthetic data to support all of the above acceptance tests..


git-svn-id: svn://10.0.0.236/trunk@209683 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/webtools/aus/tests/Verify.txt

@@ -1,4 +1,4 @@
-!1 Variables
+1 Variables
 !define COMMAND_PATTERN {python %m -v %p}
 !define TEST_RUNNER {/Users/morgamic/pyfit/fit/FitServer.py}
 !define host {http://khan.mozilla.org/~morgamic/austest/update/2}
@@ -59,15 +59,17 @@
 |7000000001|channel|complete|partial|false|false|false|true|
 |7000000001|channel-cck-partner|complete|partial|false|false|false|true|
 
-!1 Major and Minor updates 
- 1 minor update
- 2 major update
+!1 Major and Minor Updates 
+ 1 minor update using new snippet schema (preed's patch)
+ 2 major update using new snippet schema (preed's patch)
+ 3 minor update using existing snippet schema (minor was the only one, previously)
 |aus.Verify|${host}|${product}|${version}|${platform}|${locale}|
 |build|channel|complete|partial|hasUpdate?|isMinorUpdate?|isMajorUpdate?|hasComplete?|hasPartial?|isValidXml?|
 |8000000001|channel|complete|partial|true|true|false|true|true|true|
 |8000000002|channel|complete|partial|true|false|true|true|true|true|
+|8000000003|channel|complete|partial|true|true|false|true|true|true|
 
-!1 os version compatibility
+!1 OS Version Compatibility
  1 supported os version, or unknown os version
  2 unsupported or blocked platform (exists in $unsupportedPlatforms in aus2 config)
 |aus.Verify|${host}|${product}|${version}|${platform}|${locale}|

mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/complete.txt

@@ -1,10 +1,11 @@
-complete
-http://synthetic.1.0.platform.buildid.locale.channel/complete008
-SHA1
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12345
-8000000003
-1.0
-1.0
-http://detail.url/content.html 
-minor
+version=1
+type=complete
+url=http://synthetic.1.0.platform.buildid.locale.channel/complete008
+hashFunction=SHA1
+hashValue=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+size=12345
+build=8000000002
+appv=1.0
+extv=1.0
+detailsUrl=http://detail.url/content.html 
+updateType=minor

mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/partial.txt

@@ -1,8 +1,9 @@
-partial
-http://synthetic.1.0.platform.buildid.locale.channel/partial008
-SHA1
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12345
-8000000003
-1.0
-1.0
+version=1
+type=partial
+url=http://synthetic.1.0.platform.buildid.locale.channel/partial008
+hashFunction=SHA1
+hashValue=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+size=12345
+build=8000000002
+appv=1.0
+extv=1.0

mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/complete.txt

@@ -1,10 +1,11 @@
-complete
-http://synthetic.1.0.platform.buildid.locale.channel/complete008
-SHA1
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12345
-8000000003
-1.0
-1.0
-http://detail.url/content.html 
-major
+version=1
+type=complete
+url=http://synthetic.1.0.platform.buildid.locale.channel/complete008
+hashFunction=SHA1
+hashValue=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+size=12345
+build=8000000003
+appv=1.0
+extv=1.0
+detailsUrl=http://detail.url/content.html 
+updateType=major

mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/partial.txt

@@ -1,8 +1,9 @@
-partial
-http://synthetic.1.0.platform.buildid.locale.channel/partial008
-SHA1
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12345
-8000000003
-1.0
-1.0
+version=1
+type=partial
+url=http://synthetic.1.0.platform.buildid.locale.channel/partial008
+hashFunction=SHA1
+hashValue=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+size=12345
+build=8000000003
+appv=1.0
+extv=1.0

mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/complete.txt

@@ -0,0 +1,10 @@
+complete
+http://synthetic.1.0.platform.buildid.locale.channel/complete008
+SHA1
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+12345
+8000000004
+1.0
+1.0
+http://detail.url/content.html 
+major

mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/partial.txt

@@ -0,0 +1,8 @@
+partial
+http://synthetic.1.0.platform.buildid.locale.channel/partial008
+SHA1
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+12345
+8000000004
+1.0
+1.0