Unittest filtering

install_test/sample_updater.py

Index: install_test/sample_updater.py
===================================================================
--- install_test/sample_updater.py	(revision 163097)
+++ install_test/sample_updater.py	(working copy)
@@ -3,13 +3,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Runs sample updater test using two Chrome builds.
+"""Runs sample updater and install tests using one or more Chrome builds.

[kkania, 2012/10/24 23:44:05]

Change this comment to
"""Tests that demonstrate use of install test framework."""

Remove all the other comments

[nkang, 2012/10/24 23:52:46]

Changed first line as suggested. Removed all other comments, except for the
first line.

 
 Test requires two arguments: build url and chrome versions to be used, rest of
 the arguments are optional. Builds must be specified in ascending order, with
 the lower version first and the higher version last, each separated by commas.
-The setUp method creates a ChromeDriver instance, which can be used to run
-tests. ChromeDriver is shutdown, upon completion of the testcase.
+Separate arguments are required for install and update test scenarios. The
+setUp method creates a ChromeDriver instance, which can be used to run tests.
+ChromeDriver is shutdown upon completion of the testcase.
 
 Example:
     $ python sample_updater.py --url=<URL> --builds=19.0.1069.0,19.0.1070.0
@@ -20,20 +21,30 @@
 import unittest
 
 from install_test import InstallTest
-from install_test import Main
 
 
 class SampleUpdater(InstallTest):
   """Sample update tests."""
 
   def testCanOpenGoogle(self):
-    """Simple Navigation."""
+    """Simple Navigation.
+
+    This test case illustrates how to run an update test. Update tests require
+    two or more builds.
+    """
+    self.Install(self.GetUpdateBuilds()[0])
     self.StartChrome()
     self._driver.get('http://www.google.com/')
-    self.UpdateBuild()
+    self.Install(self.GetUpdateBuilds()[1])
     self.StartChrome()
     self._driver.get('http://www.google.org/')
 
+  def testCanOpenGoogleOrg(self):
+    """Simple Navigation.
 
-if __name__ == '__main__':
-  Main()
+    This test case illustrates how to run a fresh install test. Simple install
+    tests, unlike update test, require only a single build.
+    """
+    self.Install(self.GetInstallBuild())
+    self.StartChrome()
+    self._driver.get('http://www.google.org/')