From aab0a70064d2d8946cc1fb32ee6dedf55610d326 Mon Sep 17 00:00:00 2001 From: "mike.morgan%oregonstate.edu" Date: Tue, 12 Sep 2006 03:54:26 +0000 Subject: [PATCH] Added conditionals to assignment of table parameters. They should only be used if a row value isn't present. Added nightly acceptance tests, and the synthetic build data to go along with them. --- webtools/aus/tests/Verify.py | 13 +++++++------ webtools/aus/tests/Verify.txt | 15 ++++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/webtools/aus/tests/Verify.py b/webtools/aus/tests/Verify.py index 3b022cdc9908..92f629a83fd2 100755 --- a/webtools/aus/tests/Verify.py +++ b/webtools/aus/tests/Verify.py @@ -93,12 +93,13 @@ class Verify(ColumnFixture): # Builds an AUS URI based on our test data. def buildUri(self): - # Assign class variables from FitNesse arguments. - self.host = self.args[0] - self.product = self.args[1] - self.version = self.args[2] - self.platform = self.args[3] - self.locale = self.args[4] + # Assign class variables from FitNesse arguments if they + # are not passed in from the row. + if (not self.host): self.host = self.args[0] + if (not self.product): self.product = self.args[1] + if (not self.version): self.version = self.args[2] + if (not self.platform): self.platform = self.args[3] + if (not self.locale): self.locale = self.args[4] return '/'.join((self.host, self.product, self.version, \ self.build, self.platform, self.locale, \ diff --git a/webtools/aus/tests/Verify.txt b/webtools/aus/tests/Verify.txt index 9482907aa9a3..b729b5eeb054 100644 --- a/webtools/aus/tests/Verify.txt +++ b/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} @@ -78,8 +78,13 @@ |9000000001|channel|complete|partial|Windows_98|false|false|false|true| !1 Nightly Updates - 1 one-off update serving both complete and partial - 2 outdated (>1 off) update serving only a complete - 3 version mapping to another branchVersion (1.0->1.x) + 1 outdated (>1 off) update serving only a complete (1.5.0.5->1.5.0.x) + 2 one-off update serving both complete and partial (1.5.0.5->1.5.0.x) + 3 client already at the latest build requests an update (no update shoudl be offered) 4 version with no branchVersion in AUS config (6.0->?) -TODO: add aus.Nightly and adjust fixtures to include variable versions. +|aus.Verify|${host}|${product}|${version}|${platform}|${locale}| +|version|build|channel|complete|partial|hasUpdate?|hasComplete?|hasPartial?|isValidXml?| +|1.5.0.5|1100000001|nightly|complete|partial|true|true|false|true| +|1.5.0.5|1100000002|nightly|complete|partial|true|true|true|true| +|1.5.0.5|1100000003|nightly|complete|partial|false|false|false|true| +|6.0|1100000001|nightly|complete|partial|false|false|false|true|