Merge lp:~edwin-grubbs/launchpad/bug-430708-registry-windmill-layer into lp:launchpad

[Edwin Grubbs]

Move test_timeline_graph.py to lib/lp/registry/windmill and covert it to run under ./bin/test.

[Edwin Grubbs (edwin-grubbs)]

Summary
-------

Moved the test_timeline_graph.py to lib/lp/registry/windmill
and made the changes necessary to have it run by ./bin/test
instead of ./bin/lp-windmill.

I added very kludgy looking for-loops to the tests to eliminate
sporadic failures that were occuring from 5% to 10% of the time.

Tests
-----

./bin/test --layer=RegistryWindmillLayer

Demo and Q/A
------------

Not QA-able.

Lint
----

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  Makefile
  lib/lp/registry/windmill/testing.py
  lib/lp/registry/windmill/tests/test_timeline_graph.py

[Edwin Grubbs (edwin-grubbs)]

Hi Barry,

Thanks for the review. Here is the incremental diff.

{{{
=== modified file 'lib/lp/registry/windmill/tests/test_timeline_graph.py'
--- lib/lp/registry/windmill/tests/test_timeline_graph.py 2009-10-09 21:40:20 +0000
+++ lib/lp/registry/windmill/tests/test_timeline_graph.py 2009-10-09 22:07:54 +0000
@@ -26,7 +26,11 @@
             option=u'style.display|none',
             timeout=u'8000')
         link_xpath = '//div/a[@href="/firefox/trunk"]'
- for i in range(0, 5):
+
+ # waits.forElement() is called multiple times because there
+ # were sporadic errors where waits.forElement() would succeed but
+ # the following assertNode() would fail 5% of the time.
+ for i in range(5):
             self.client.waits.forElement(xpath=link_xpath)
         self.client.asserts.assertNode(xpath=link_xpath)

@@ -54,7 +58,11 @@
             option=u'style.display|block',
             timeout=u'8000')
         self.client.waits.forElement(id=u'timeline-loading', timeout=u'20000')
- for i in range(0, 5):
+
+ # waits.forElementProperty() is called multiple times because there
+ # were sporadic errors where waits.forElement() would succeed but
+ # the following assertProperty() would fail 5% of the time.
+ for i in range(5):
             self.client.waits.forElementProperty(
                 id=u'timeline-loading',
                 option=u'style.display|none')
}}}

[Barry Warsaw (barry)]

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2009-10-07 09:55:24 +0000
+++ Makefile	2009-10-09 22:59:15 +0000
@@ -92,6 +92,7 @@
 	@echo
 	bin/test $(VERBOSITY) --layer=BugsWindmillLayer
 	bin/test $(VERBOSITY) --layer=CodeWindmillLayer
+	bin/test $(VERBOSITY) --layer=RegistryWindmillLayer
 	bin/test $(VERBOSITY) --layer=SoyuzWindmillLayer
 
 jscheck_functest: build

=== added directory 'lib/lp/registry/windmill'
=== added file 'lib/lp/registry/windmill/__init__.py'
=== added file 'lib/lp/registry/windmill/testing.py'
--- lib/lp/registry/windmill/testing.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/windmill/testing.py	2009-10-09 22:59:15 +0000
@@ -0,0 +1,18 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Registry-specific testing infrastructure for Windmill."""
+
+__metaclass__ = type
+__all__ = [
+    'RegistryWindmillLayer',
+    ]
+
+
+from canonical.testing.layers import BaseWindmillLayer
+
+
+class RegistryWindmillLayer(BaseWindmillLayer):
+    """Layer for Registry Windmill tests."""
+
+    base_url = 'http://launchpad.dev:8085/'

=== added directory 'lib/lp/registry/windmill/tests'
=== added file 'lib/lp/registry/windmill/tests/__init__.py'
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_timeline_graph.py' => 'lib/lp/registry/windmill/tests/test_timeline_graph.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_timeline_graph.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/windmill/tests/test_timeline_graph.py	2009-10-09 22:59:15 +0000
@@ -1,65 +1,88 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+import unittest
+
 from windmill.authoring import WindmillTestClient
 
-from canonical.launchpad.windmill.testing import lpuser
-
-
-def test_timeline_graph():
-    """Test timeline graph on /$project/+timeline-graph page."""
-
-    client = WindmillTestClient('TimelineGraph')
-
-    client.open(url=u'http://launchpad.dev:8085/firefox/+timeline-graph')
-    client.waits.forElement(id=u'spinner', timeout=u'20000')
-    client.waits.forElementProperty(
-        id=u'spinner',
-        option=u'style.display|none',
-        timeout=u'8000')
-    client.asserts.assertNode(xpath='//div/a[@href="/firefox/trunk"]')
-
-def test_project_timeline_graph():
-    """Test that the timeline graph loads on /$project page."""
-
-    client = WindmillTestClient('TimelineGraph')
-    client.open(url=u'http://launchpad.dev:8085/firefox')
-
-    client.waits.forElement(id=u'timeline-loading', timeout=u'20000')
-    client.waits.forElementProperty(
-        id=u'timeline-iframe',
-        option=u'style.display|block',
-        timeout=u'8000')
-    client.asserts.assertProperty(
-        id=u'timeline-loading',
-        validator=u'style.display|none')
-
-def test_series_timeline_graph():
-    """Test that the timeline graph loads on /$project/$series page."""
-
-    client = WindmillTestClient('TimelineGraph')
-    client.open(url=u'http://launchpad.dev:8085/firefox/trunk')
-
-    client.waits.forElement(id=u'timeline-loading', timeout=u'20000')
-    client.waits.forElementProperty(
-        id=u'timeline-iframe',
-        option=u'style.display|block',
-        timeout=u'8000')
-    client.asserts.assertProperty(
-        id=u'timeline-loading',
-        validator=u'style.display|none')
-
-def test_all_series_timeline_graph():
-    """Test that the timeline graph loads on /$project/+series page."""
-
-    client = WindmillTestClient('TimelineGraph')
-    client.open(url=u'http://launchpad.dev:8085/firefox/+series')
-
-    client.waits.forElement(id=u'timeline-loading', timeout=u'20000')
-    client.waits.forElementProperty(
-        id=u'timeline-iframe',
-        option=u'style.display|block',
-        timeout=u'8000')
-    client.asserts.assertProperty(
-        id=u'timeline-loading',
-        validator=u'style.display|none')
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+class TestTimelineGraph(TestCaseWithFactory):
+
+    layer = RegistryWindmillLayer
+
+    def setUp(self):
+        self.client = WindmillTestClient('TimelineGraph')
+
+    def test_timeline_graph(self):
+        """Test timeline graph on /$project/+timeline-graph page."""
+
+        self.client.open(
+            url=u'http://launchpad.dev:8085/firefox/+timeline-graph')
+        self.client.waits.forElement(id=u'spinner', timeout=u'20000')
+        self.client.waits.forElementProperty(
+            id=u'spinner',
+            option=u'style.display|none',
+            timeout=u'8000')
+        link_xpath = '//div/a[@href="/firefox/trunk"]'
+
+        # waits.forElement() is called multiple times because there
+        # were sporadic errors where waits.forElement() would succeed but
+        # the following assertNode() would fail 5% of the time.
+        for i in range(5):
+            self.client.waits.forElement(xpath=link_xpath)
+        self.client.asserts.assertNode(xpath=link_xpath)
+
+    def test_project_timeline_graph(self):
+        """Test that the timeline graph loads on /$project page."""
+
+        self.client.open(url=u'http://launchpad.dev:8085/firefox')
+
+        self.client.waits.forElement(id=u'timeline-loading', timeout=u'20000')
+        self.client.waits.forElementProperty(
+            id=u'timeline-iframe',
+            option=u'style.display|block',
+            timeout=u'8000')
+        self.client.asserts.assertProperty(
+            id=u'timeline-loading',
+            validator=u'style.display|none')
+
+    def test_series_timeline_graph(self):
+        """Test that the timeline graph loads on /$project/$series page."""
+
+        self.client.open(url=u'http://launchpad.dev:8085/firefox/trunk')
+
+        self.client.waits.forElementProperty(
+            id=u'timeline-iframe',
+            option=u'style.display|block',
+            timeout=u'8000')
+        self.client.waits.forElement(id=u'timeline-loading', timeout=u'20000')
+
+        # waits.forElementProperty() is called multiple times because there
+        # were sporadic errors where waits.forElement() would succeed but
+        # the following assertProperty() would fail 5% of the time.
+        for i in range(5):
+            self.client.waits.forElementProperty(
+                id=u'timeline-loading',
+                option=u'style.display|none')
+        self.client.asserts.assertProperty(
+            id=u'timeline-loading',
+            validator=u'style.display|none')
+
+    def test_all_series_timeline_graph(self):
+        """Test that the timeline graph loads on /$project/+series page."""
+
+        self.client.open(url=u'http://launchpad.dev:8085/firefox/+series')
+
+        self.client.waits.forElement(id=u'timeline-loading', timeout=u'20000')
+        self.client.waits.forElementProperty(
+            id=u'timeline-iframe',
+            option=u'style.display|block',
+            timeout=u'8000')
+        self.client.asserts.assertProperty(
+            id=u'timeline-loading',
+            validator=u'style.display|none')
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)