diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | src/unittest/testwebvi.py | 25 | ||||
| -rw-r--r-- | templates/ruutufi/mainmenu.xsl | 2 |
3 files changed, 15 insertions, 13 deletions
@@ -201,3 +201,4 @@ Video site modules: - Stream low bandwidth Youtube videos by default (configurable in /etc/webvi.conf) - Fixed Google video module. +- Disabled ruutu.fi search which is not working. diff --git a/src/unittest/testwebvi.py b/src/unittest/testwebvi.py index c76931e..e25cd2d 100644 --- a/src/unittest/testwebvi.py +++ b/src/unittest/testwebvi.py @@ -349,10 +349,9 @@ class TestServiceModules(unittest.TestCase): def testRuutuFi(self): # Category page ref = self.getServiceReference('../../templates/ruutufi') - links = self.downloadAndExtractLinks(ref, 4, 'category') + links = self.downloadAndExtractLinks(ref, 3, 'category') - # The first is "Search", the second is "Series" - seriesref = links[1].ref + seriesref = links[0].ref # Series page links = self.downloadAndExtractLinks(seriesref, 1, 'series') @@ -365,19 +364,19 @@ class TestServiceModules(unittest.TestCase): self.assertNotEqual(videolink.stream, None, 'No media object in a video link') self.assertNotEqual(videolink.ref, None, 'No description page in a video link') - def testRuutuFiSearch(self): - menuobj = self.downloadMenuPage('wvt:///ruutufi/search.xsl', 'search') - self.assertTrue(len(menuobj) >= 2, 'Too few items in search menu') + # def testRuutuFiSearch(self): + # menuobj = self.downloadMenuPage('wvt:///ruutufi/search.xsl', 'search') + # self.assertTrue(len(menuobj) >= 2, 'Too few items in search menu') - self.assertTrue(isinstance(menuobj[0], menu.MenuItemTextField)) - self.assertTrue(isinstance(menuobj[1], menu.MenuItemSubmitButton)) + # self.assertTrue(isinstance(menuobj[0], menu.MenuItemTextField)) + # self.assertTrue(isinstance(menuobj[1], menu.MenuItemSubmitButton)) - # Query term - menuobj[0].value = 'nelonen' + # # Query term + # menuobj[0].value = 'nelonen' - resultref = menuobj[1].activate() - self.assertNotEqual(resultref, None) - self.downloadAndExtractLinks(resultref, 1, 'search result') + # resultref = menuobj[1].activate() + # self.assertNotEqual(resultref, None) + # self.downloadAndExtractLinks(resultref, 1, 'search result') def testSubtv(self): # Category page diff --git a/templates/ruutufi/mainmenu.xsl b/templates/ruutufi/mainmenu.xsl index 1d70ac3..e241924 100644 --- a/templates/ruutufi/mainmenu.xsl +++ b/templates/ruutufi/mainmenu.xsl @@ -7,10 +7,12 @@ <wvmenu> <title>Ruutu.fi</title> +<!-- <link> <label>Haku</label> <ref>wvt:///ruutufi/search.xsl</ref> </link> +--> <link> <label>Listaa sarjat</label> |