Merge lp:~dholbach/help-app/functional-test-template-improvements into lp:~nskaggs/help-app/functional-test-template-improvements

[Daniel Holbach]

[lp:~dholbach/help-app/functional-test-template-improvements]

162. By Daniel Holbach on 2015-06-08

move assertion if build worked out into test_app and test_web

163. By Daniel Holbach on 2015-06-08

move test into setUp of TestApp/TestWeb

=== modified file 'HACKING'
--- HACKING	2015-05-28 19:34:12 +0000
+++ HACKING	2015-06-08 15:15:41 +0000
@@ -171,7 +171,7 @@
     sudo apt-get install oxideqt-chromedriver
     sudo apt-add-repository ppa:canonical-platform-qa/selenium
     sudo apt-get update
-    sudo apt-get install python3-selenium
+    sudo apt-get install python3-selenium xvfb
 
 Run the tests:
 

=== modified file 'internals/tests/build_utils.py'
--- internals/tests/build_utils.py	2015-06-05 15:03:41 +0000
+++ internals/tests/build_utils.py	2015-06-08 15:15:41 +0000
@@ -7,6 +7,7 @@
 sys.path.insert(0, '../..')
 
 from pelicanconf import TOP_LEVEL_DIR
+import pelicanconf
 
 
 def clean_tempdir(tempdir):
@@ -26,7 +27,9 @@
         if self.build == 'web':
             self.env = {'OUTPUTDIR_WEB': self.tempdir}
         self.pwd = os.getcwd()
-        os.chdir(TOP_LEVEL_DIR)
+        top_level_dir = os.path.join(os.path.dirname(pelicanconf.__file__),
+                                     TOP_LEVEL_DIR)
+        os.chdir(top_level_dir)
         self.run_build()
         self.find_html_files()
         self.html_path = os.path.commonprefix(self.html_files)

=== modified file 'internals/tests/functional/help_app/tests/test_app.py'
--- internals/tests/functional/help_app/tests/test_app.py	2015-06-05 15:14:52 +0000
+++ internals/tests/functional/help_app/tests/test_app.py	2015-06-08 15:15:41 +0000
@@ -5,6 +5,9 @@
 
 
 class TestApp(HelpAppTest):
+    def setUp(self):
+        super(TestApp, self).setUp()
+        self.assertEquals(self.app.build_runner.rc, 0)
 
     def test_basic_launch(self):
         self.assertThat(self.app, NotEquals(None))

=== modified file 'internals/tests/functional/help_app/tests/test_web.py'
--- internals/tests/functional/help_app/tests/test_web.py	2015-06-05 15:14:52 +0000
+++ internals/tests/functional/help_app/tests/test_web.py	2015-06-08 15:15:41 +0000
@@ -5,6 +5,9 @@
 
 
 class TestWeb(HelpWebTest):
+    def setUp(self):
+        super(TestWeb, self).setUp()
+        self.assertEquals(self.app.build_runner.rc, 0)
 
     def test_basic_launch(self):
         self.assertThat(self.app, NotEquals(None))