Update Samba build farm to new web site layout.

[build-farm.git] / buildfarm / tests / test_util.py

diff --git a/buildfarm/tests/test_util.py b/buildfarm/tests/test_util.py
index 3a1d5a4697d6fa6ca173a447adb34c7f681819e9..fbd8f2474f69a36fec220fa915b4feac80ac7b60 100755 (executable)
--- a/buildfarm/tests/test_util.py
+++ b/buildfarm/tests/test_util.py
@@ -22,22 +22,6 @@ import unittest
 
 from buildfarm import util
 
-class CountLinesTests(unittest.TestCase):
-
-    def test_simple(self):
-        self.assertEquals(2, util.count_lines("foo\nbar"))
-        self.assertEquals(1, util.count_lines("bar"))
-        self.assertEquals(1, util.count_lines(""))
-
-
-class ChangeExtensionTests(unittest.TestCase):
-
-    def test_simple(self):
-        self.assertEquals("foo.bar", util.ChangeExtension("foo.old", "bar"))
-        self.assertEquals("foo.png", util.ChangeExtension("foo.png", "png"))
-        self.assertEquals("foobar.png", util.ChangeExtension("foobar", "png"))
-
-
 class DhmTimeTests(unittest.TestCase):
 
     def test_simple(self):
@@ -56,7 +40,7 @@ class LoadTests(testtools.TestCase):
         f = os.fdopen(fd, 'w')
         f.write("""one
 two
-three\r
+three
 
 for
 """)
@@ -65,13 +49,21 @@ for
         self.assertEquals(4, len(l))
         self.assertEquals("three", l[2])
 
-
-class StripHtmlTests(unittest.TestCase):
+class SambaWebFileLoadTest(testtools.TestCase):
 
     def test_simple(self):
-        self.assertEquals("", util.strip_html("<!--foo-->"))
-        self.assertEquals("bar ", util.strip_html("<!--foo-->bar <!--bloe-->"))
-        self.assertEquals("bar <bloe>", util.strip_html("<bar>bar <bloe></bar>"))
-        self.assertEquals("", util.strip_html("<bar><bloe></bloe></bar>"))
+        fd, name = tempfile.mkstemp()
+        self.addCleanup(os.remove, name)
+        f = os.fdopen(fd, 'w')
+        f.write('href="/samba/index.html"')
+        f.close()
+        l = util.SambaWebFileLoad(os.getcwd(),name)
+        self.assertEquals('href="http://www.samba.org/samba/index.html"', l)
+        fd1, name1 = tempfile.mkstemp()
+        self.addCleanup(os.remove, name1)
+        f1 = os.fdopen(fd1, 'w')
+        f1.write('<!--#include virtual="/samba/name2" -->')
+        f1.close()
+        l1 = util.SambaWebFileLoad(os.path.dirname(os.path.realpath("name1")),name1)
+        self.assertEquals('', l1)
 
-        self.assertEquals("bla", util.strip_html("<a href=\"foo\">bla</a>"))