diff options
| author | Antti Ajanki <antti.ajanki@iki.fi> | 2011-08-08 21:18:09 +0300 |
|---|---|---|
| committer | Antti Ajanki <antti.ajanki@iki.fi> | 2011-08-08 21:20:47 +0300 |
| commit | 3076938d5d8fc103baeaeb9eec56c049221fd70e (patch) | |
| tree | 096d05fd0819bc3ee58e8216896e4cc09a13ffb6 | |
| parent | 8b86be81f377aec5f048afa81c7e9c03b8aa7886 (diff) | |
| download | vdr-plugin-webvideo-3076938d5d8fc103baeaeb9eec56c049221fd70e.tar.gz vdr-plugin-webvideo-3076938d5d8fc103baeaeb9eec56c049221fd70e.tar.bz2 | |
Disabled Vimeo search
| -rw-r--r-- | src/unittest/testwebvi.py | 27 | ||||
| -rw-r--r-- | templates/vimeo.com/mainmenu.xsl | 4 |
2 files changed, 8 insertions, 23 deletions
diff --git a/src/unittest/testwebvi.py b/src/unittest/testwebvi.py index d50126b..1d7be9a 100644 --- a/src/unittest/testwebvi.py +++ b/src/unittest/testwebvi.py @@ -220,12 +220,11 @@ class TestServiceModules(unittest.TestCase): def testVimeo(self): # Category page ref = self.getServiceReference('../../templates/vimeo.com') - links = self.downloadAndExtractLinks(ref, 3, 'Vimeo main page') + links = self.downloadAndExtractLinks(ref, 2, 'Vimeo main page') - # The first is "Search", the second is "Channels" and the - # third is "Groups" - channelsref = links[1].ref - groupsref = links[2].ref + # The first "Channels" and the second is "Groups" + channelsref = links[0].ref + groupsref = links[1].ref # Channels page links = self.downloadAndExtractLinks(channelsref, 2, 'channels') @@ -247,24 +246,6 @@ class TestServiceModules(unittest.TestCase): # Navigation page links = self.downloadAndExtractLinks(links[0].ref, 2, 'groups navigation') - def testVimeoSearch(self): - menuobj = self.downloadMenuPage('wvt:///vimeo.com/search.xsl?srcurl=http://www.vimeo.com/', 'search') - self.assertTrue(len(menuobj) >= 3, 'Too few items in search menu') - - self.assertTrue(isinstance(menuobj[0], menu.MenuItemTextField)) - self.assertTrue(isinstance(menuobj[1], menu.MenuItemList)) - self.assertTrue(len(menuobj[1].items) >= 2) - self.assertTrue(isinstance(menuobj[2], menu.MenuItemSubmitButton)) - - # Query term - menuobj[0].value = 'vimeo' - # Sort by: newest - menuobj[1].current = 1 - - resultref = menuobj[2].activate() - self.assertNotEqual(resultref, None) - self.downloadAndExtractLinks(resultref, 1, 'search result') - def testYLEAreena(self): # Category page ref = self.getServiceReference('../../templates/areena.yle.fi') diff --git a/templates/vimeo.com/mainmenu.xsl b/templates/vimeo.com/mainmenu.xsl index 2517ba6..bdd4d34 100644 --- a/templates/vimeo.com/mainmenu.xsl +++ b/templates/vimeo.com/mainmenu.xsl @@ -7,10 +7,14 @@ <wvmenu> <title>Vimeo</title> +<!-- Disabled 08082011 --> +<!-- "The requested URL returned error" when retrieving the results --> +<!-- <link> <label>Search</label> <ref>wvt:///vimeo.com/search.xsl?srcurl=http://vimeo.com/</ref> </link> +--> <link> <label>Channels</label> |