Merge lp:~dholbach/help-app/fix-automated-testing-content-build into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[Daniel Holbach]

[lp:~dholbach/help-app/fix-automated-testing-content-build]

88. By Daniel Holbach on 2015-03-10

make pep8 happy

[Nicholas Skaggs (nskaggs)]

review: Needs Fixing

[lp:~dholbach/help-app/fix-automated-testing-content-build]

89. By Daniel Holbach on 2015-03-10

simplify logic somewhat

[Nicholas Skaggs (nskaggs)]

review: Approve

=== modified file 'edit-here/tests/test_links.py'
--- edit-here/tests/test_links.py	2015-03-09 15:04:32 +0000
+++ edit-here/tests/test_links.py	2015-03-10 15:00:30 +0000
@@ -10,8 +10,12 @@
 
 def require_build(build):
     tempdir = tempfile.mkdtemp()
-    ret = subprocess.call(['make', '-es', build],
-                          env={'OUTPUTDIR': tempdir})
+    env = {}
+    if build == 'html':
+        env = {'OUTPUTDIR': tempdir}
+    if build == 'web':
+        env = {'OUTPUTDIR_WEB': tempdir}
+    ret = subprocess.call(['make', '-es', build], env=env)
     return (ret, tempdir)
 
 
@@ -28,7 +32,7 @@
             for name, value in attrs:
                 if name == "href":
                     url = urllib.parse.urlparse(value)
-                    if not url.netloc or url.netloc == 'localhost':
+                    if value != '#' and url.netloc in [None, '', 'localhost']:
                         self.links += [value]
 
     def reload(self):