Added pip and setuptools, required in virtualenv, to requirements.txt in order to simplify buildbot testing of package installation and version testing.

- Legacy-Id: 9560

ietf/utils/test_utils.py

@@ -35,6 +35,7 @@
 import os
 import re
 import sys
+import html5lib
 from datetime import datetime
 import urllib2 as urllib
 from difflib import unified_diff
@@ -286,6 +287,8 @@ class TestCase(django.test.TestCase):
     We don't flush the database, as that triggers a re-load of initial_data.
     """
 
+    parser = html5lib.HTMLParser(strict=True)
+
     def _fixture_setup(self):
         global loaded_fixtures
 
@@ -316,3 +319,15 @@ class TestCase(django.test.TestCase):
                 loaded_fixtures += fixtures
 
         super(TestCase, self)._fixture_setup()
+
+
+    def assertValidHTML(self, data):
+        try:
+            parser.parse(data)
+        except Exception as e:
+            raise self.failureException(str(e))
+
+    def assertValidHTMLResponse(self, resp):
+        self.assertHttpOK(resp)
+        self.assertTrue(resp['Content-Type'].startswith('text/html'))
+        self.assertValidHTML(resp.content)

ready-for-merge

@@ -7,7 +7,8 @@
 
 # --- Add entries at the top ---
 
-personal/lars/6.0.2.dev0@9526
+personal/rjs/v6.0.2.dev0@9540:9542
+#personal/lars/6.0.2.dev0@9526
 personal/lars/6.0.2.dev0@9525
 personal/lars/6.0.2.dev0@9524
 personal/willem/v5.12.4.dev0@9316

requirements.txt

@@ -11,11 +11,13 @@ html5lib>=0.90
 mimeparse>=0.1.3		# for TastPie
 MySQL-python>=1.2.5
 pathlib>=1.0
+pip>=6.0
 pyflakes>=0.8.1
 pyquery>1.2.4
 python-dateutil>=2.2
 python-magic>=0.4.6
 pytz>=2014.7
+setuptools>=1.2
 six>=1.8.0
 django-tastypie>=0.12.1
 wsgiref>=0.1.2