Update E2E tests.

Change-Id: Ifdfd215cfcc4fb52317f6a8c27aa5d9ed5dbfb9e

tests/endtoend/base.py

@@ -90,7 +90,8 @@ class TestBase(fixtures.BaseTestFixture):
         """
         response = requests.get(url)
         content = BeautifulSoup(response.text)
-        return content.findAll()
+        text = content.getText()
+        return text.encode('utf-8')
 
     def assertSameContent(self, origin_url, cdn_url):
         """Asserts that the origin & access_url serve the same content

tests/endtoend/test_caching.py

@@ -71,8 +71,7 @@ class TestCaching(base.TestBase):
             "rules": [{
                 "name": "default",
                 "request_url": "/*",
-            }],
-            "hostheadertype": "origin"
+            }]
         }]
         caching = [
             {"name": "default",