From 2668616b5dd5c67eca4985f986c6a2ffa330c0f2 Mon Sep 17 00:00:00 2001 From: "mike.morgan%oregonstate.edu" Date: Mon, 11 Sep 2006 06:11:50 +0000 Subject: [PATCH] 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 | 12 ++++++----- .../8000000001/locale/channel/complete.txt | 21 ++++++++++--------- .../8000000001/locale/channel/partial.txt | 17 ++++++++------- .../8000000002/locale/channel/complete.txt | 21 ++++++++++--------- .../8000000002/locale/channel/partial.txt | 17 ++++++++------- .../8000000003/locale/channel/complete.txt | 10 +++++++++ .../8000000003/locale/channel/partial.txt | 8 +++++++ 7 files changed, 65 insertions(+), 41 deletions(-) create mode 100644 mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/complete.txt create mode 100644 mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/partial.txt diff --git a/mozilla/webtools/aus/tests/Verify.txt b/mozilla/webtools/aus/tests/Verify.txt index 461257eef62..9482907aa9a 100644 --- a/mozilla/webtools/aus/tests/Verify.txt +++ b/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}| diff --git a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/complete.txt b/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/complete.txt index b798fa4cf51..09c9e57dda0 100644 --- a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/complete.txt +++ b/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 diff --git a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/partial.txt b/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/partial.txt index cb5cfe049fc..8d07f047f40 100644 --- a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000001/locale/channel/partial.txt +++ b/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 diff --git a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/complete.txt b/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/complete.txt index 4a0811c2ee6..d19e194bfad 100644 --- a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/complete.txt +++ b/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 diff --git a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/partial.txt b/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/partial.txt index cb5cfe049fc..20de0dbbb24 100644 --- a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000002/locale/channel/partial.txt +++ b/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 diff --git a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/complete.txt b/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/complete.txt new file mode 100644 index 00000000000..955d0ae1c6f --- /dev/null +++ b/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 diff --git a/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/partial.txt b/mozilla/webtools/aus/tests/data/3/Synthetic/1.0/platform/8000000003/locale/channel/partial.txt new file mode 100644 index 00000000000..f3f02b89743 --- /dev/null +++ b/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