Checking in test changes from bug 457344, r=reed.
git-svn-id: svn://10.0.0.236/trunk@254458 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -6,6 +6,7 @@ Released under the terms of the GNU General Public License version 2 or later.
|
||||
|
||||
import feedparser # http://feedparser.org/
|
||||
import urllib2
|
||||
from urllib import pathname2url
|
||||
from fit.ColumnFixture import ColumnFixture
|
||||
|
||||
auth_handler = urllib2.HTTPBasicAuthHandler()
|
||||
@@ -133,13 +134,17 @@ class Verify(ColumnFixture):
|
||||
if (not self.osVersion): self.osVersion = self.args[6]
|
||||
|
||||
if (self.osVersion != "NULL"):
|
||||
return '/'.join((self.host, self.updateVersion, self.product, self.version, \
|
||||
self.build, self.platform, self.locale, \
|
||||
self.channel, self.osVersion, self.dist, \
|
||||
self.distVersion, "update.xml"))
|
||||
return '/'.join((self.host,
|
||||
pathname2url('/'.join((self.updateVersion, self.product, self.version,
|
||||
self.build, self.platform, self.locale,
|
||||
self.channel, self.osVersion, self.dist,
|
||||
self.distVersion, "update.xml")))
|
||||
))
|
||||
else:
|
||||
return '/'.join((self.host, self.updateVersion, self.product, self.version, \
|
||||
self.build, self.platform, self.locale, \
|
||||
self.channel, "update.xml"))
|
||||
return '/'.join((self.host,
|
||||
pathname2url('/'.join((self.updateVersion, self.product, self.version,
|
||||
self.build, self.platform, self.locale,
|
||||
self.channel, "update.xml")))
|
||||
))
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
!1 Variables
|
||||
!define COMMAND_PATTERN {python %m -v %p}
|
||||
!define TEST_RUNNER {/home/morgamic/pyfit/fit/FitServer.py}
|
||||
!define host {http://khan-vm.mozilla.org/~morgamic/austest/update}
|
||||
!define host {http://khan.mozilla.org/~morgamic/aus/update}
|
||||
!define updateVersion {2}
|
||||
!define product {Synthetic}
|
||||
!define version {1.0}
|
||||
@@ -86,19 +86,44 @@
|
||||
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)
|
||||
4 update using new snippet schema when no updateType is present
|
||||
|aus.Verify|${host}|${updateVersion}|${product}|${version}|${platform}|${locale}|${osVersion}|
|
||||
|build|channel|complete|partial|licenseUrl|hasUpdate?|isMinorUpdate?|isMajorUpdate?|hasLicenseUrl?|hasComplete?|hasPartial?|isValidXml?|
|
||||
|8000000001|channel|complete|partial|license8|true|true|false|false|true|true|true|
|
||||
|8000000002|channel|complete|partial|license8|true|false|true|true|true|true|true|
|
||||
|8000000003|channel|complete|partial|license8|true|true|false|false|true|true|true|
|
||||
|8000000004|channel|complete|partial|license8|true|true|false|false|true|true|true|
|
||||
|
||||
!1 OS Version Compatibility
|
||||
1 supported os version, or unknown os version
|
||||
2 unsupported or blocked platform (exists in $unsupportedPlatforms in aus2 config)
|
||||
!1 OS Version Compatibility for Major Updates
|
||||
1 major update is served for Windows 2000
|
||||
2 major update is served for Windows XP
|
||||
3 major update is served for Windows Vista
|
||||
4 major update is served for OS X 10.4
|
||||
5 major update is served for OS X 10.5
|
||||
6 major update is served for Linux with GTK > 2.10
|
||||
7 no update is served for Windows 95
|
||||
8 no update is served for Windows 98
|
||||
9 no update is served for Windows ME
|
||||
0 no update is served for OS X 10.3
|
||||
1 no update is served for Linux with GTK < 2.10
|
||||
|aus.Verify|${host}|${updateVersion}|${product}|${version}|${platform}|${locale}|
|
||||
|build|channel|complete|partial|osVersion|hasUpdate?|hasComplete?|hasPartial?|isValidXml?|
|
||||
|9000000001|channel|complete|partial|Web 2.0|true|true|true|true|
|
||||
|9000000001|channel|complete|partial|Windows_98|false|false|false|true|
|
||||
|build|channel|complete|partial|osVersion|hasUpdate?|isMinorUpdate?|isMajorUpdate?|hasComplete?|hasPartial?|isValidXml?|
|
||||
|9000000001|channel|complete|partial|Windows_NT 5.0|true|false|true|true|true|true|
|
||||
|9000000001|channel|complete|partial|Windows_NT 5.1|true|false|true|true|true|true|
|
||||
|9000000001|channel|complete|partial|Windows_NT 6.0|true|false|true|true|true|true|
|
||||
|9000000001|channel|complete|partial|Darwin 8.0|true|false|true|true|true|true|
|
||||
|9000000001|channel|complete|partial|Darwin 9.0|true|false|true|true|true|true|
|
||||
|9000000001|channel|complete|partial|Linux 2.6.21.5-smp (GTK 2.10.13)|true|false|true|true|true|true|
|
||||
|9000000001|channel|complete|partial|Windows_95|false|false|false|false|false|true|
|
||||
|9000000001|channel|complete|partial|Windows_98|false|false|false|false|false|true|
|
||||
|9000000001|channel|complete|partial|Windows_98 4.90|false|false|false|false|false|true|
|
||||
|9000000001|channel|complete|partial|Darwin 7.0|false|false|false|false|false|true|
|
||||
|9000000001|channel|complete|partial|Linux 2.6.21.5-smp (GTK 2.8.20)|false|false|false|false|false|true|
|
||||
|9000000001|channel|complete|partial|Linux 2.6.21.5-smp (GTK 2.20.20)|true|false|true|true|true|true|
|
||||
|8000000004|channel|complete|partial|Darwin 7.0|true|true|false|true|true|true|
|
||||
|8000000004|channel|complete|partial|Linux 2.6.21.5-smp (GTK 2.8.20)|true|true|false|true|true|true|
|
||||
|8000000004|channel|complete|partial|Windows_98|true|true|false|true|true|true|
|
||||
|
||||
|
||||
!1 Nightly Updates
|
||||
1 outdated (>1 off) update serving only a complete (1.5.0.5->1.5.0.x)
|
||||
|
||||
Reference in New Issue
Block a user