Merge lp:~dpniel/ubuntu-autopilot-tests/firefox_combined into lp:ubuntu-autopilot-tests

[Dan Chapman ]

I have combined the three current tests into one combined tests. If you view
the video here:

https://jenkins.qa.ubuntu.com/job/autopilot-ubuntu-applications/17/label=autopilot-ati/artifact/results/autopilot/videos/

You can see that the firefox process is not termianting quick enough between
one tests teardown and the next tests setup. It can take up to 10 seconds or so
for FF to terminate fully. So combining it into one tests wipes this out.

Let me know what you think, hopefully this will have to be the last edit :-)

Dan

[Nicholas Skaggs (nskaggs)]

:-) I agree I hope this is the last edit.. Lesson learned for including non-introspectable apps into the production branch.

review: Approve

=== modified file 'ubuntu_autopilot_tests/firefox/test_firefox.py'
--- ubuntu_autopilot_tests/firefox/test_firefox.py	2013-07-15 16:11:32 +0000
+++ ubuntu_autopilot_tests/firefox/test_firefox.py	2013-07-17 11:50:41 +0000
@@ -20,38 +20,13 @@
         self.app.set_focus()
         self.assertTrue(self.app.is_focused)
 
-    def test_browse_jenkins(self):
+    def test_firefox_works(self):
         #Test-case name: firefox/fir-001
         #This test will check that Firefox can display webpages
 
         #check that page title loaded jenkins
         self.assertThat(lambda: self.app.name, Eventually(Contains("Jenkins"), timeout=30))
-
-    def test_google_search_suggestions(self):
-        #Test-case name: firefox/fir-002
-        #This test will check that Firefox can display search suggestions
-    
-        #open search box, switch to google
-        self.keyboard.press_and_release("Ctrl+k")
-        self.keyboard.press_and_release("F4")
-        self.keyboard.press_and_release("g")
-    
-        #search for ubuntu server docs
-        self.keyboard.type("ubuntu server docs")
-    
-        #ensure we have a generated list of suggestions
-        #WE CAN'T DO THIS :-(
-    
-        #go to results page
-        self.keyboard.type("\n")
-    
-        #check results by looking at page title
-        self.assertThat(lambda: self.app.name, Eventually(Contains("Google")))
         
-        self.assertThat(lambda: self.app.name, Eventually(Contains("server docs")))
-    
-    
-    def test_tabs_and_windows(self):
         #This test will check that Firefox can create tabs and windows
         self.assertThat(lambda: self.app.name,
                         Eventually(Contains("Jenkins"), timeout=30))
@@ -92,3 +67,30 @@
         #check we have gone back to one window
         self.assertThat(lambda: len(self.manager.get_open_windows_by_application("Firefox")),
                         Eventually(Equals(originalWindowCount)))
+
+    
+        #Test-case name: firefox/fir-002
+        #This test will check that Firefox can display search suggestions
+    
+        #open search box, switch to google
+        self.keyboard.press_and_release("Ctrl+k")
+        self.keyboard.press_and_release("F4")
+        self.keyboard.press_and_release("g")
+    
+        #search for ubuntu server docs
+        self.keyboard.type("ubuntu server docs")
+    
+        #ensure we have a generated list of suggestions
+        #WE CAN'T DO THIS :-(
+    
+        #go to results page
+        self.keyboard.type("\n")
+    
+        #check results by looking at page title
+        self.assertThat(lambda: self.app.name, Eventually(Contains("Google")))
+        
+        self.assertThat(lambda: self.app.name, Eventually(Contains("server docs")))
+    
+    
+ 
+