← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jockey/saucy

« back to all changes in this revision

Viewing changes to tests/handlers.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-11-02 11:21:03 UTC
  • Revision ID: package-import@ubuntu.com-20111102112103-vqqeyc32czx008wm
Tags: 0.9.5-0ubuntu2
https://launchpad.net/bugs/885204
* Merge from trunk:
  - Add XorgDriverHandler.loaded_drivers(), as a prerequisite for LP #885204
  - Update translations from Launchpad.
* data/handlers/{fglrx,nvidia}.py: Do not offer these drivers if intel
  X.org driver is loaded. On hybrid systems where intel is active,
  installing the proprietary drivers and their libGL breaks intel.
  (LP: #885204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/handlers.py
1008
1008
        finally:
1009
1009
            OSLib.inst.video_driver_abi = orig_video_driver_abi
1010
1010
 
 
1011
    def test_xorg_driver_loaded_drivers(self):
 
1012
        '''XorgDriverHandler.loaded_drivers()'''
 
1013
 
 
1014
        # system one
 
1015
        drivers = XorgDriverHandler.loaded_drivers()
 
1016
        self.assertEqual(type(drivers), type(set()))
 
1017
        if 'DISPLAY' in os.environ:
 
1018
            self.assertGreaterEqual(len(drivers), 1)
 
1019
 
 
1020
        # synthetic
 
1021
        with open(os.path.join(OSLib.inst.workdir, 'Xorg.1.log'), 'w') as f:
 
1022
            f.write('''X.Org X Server 1.10.4
 
1023
[    14.451] (II) LoadModule: "intel"
 
1024
[    14.452] (II) Loading /usr/lib/xorg/modules/drivers/intel_drv.so
 
1025
[    14.459] (II) LoadModule: "vesa"
 
1026
[    14.459] (II) Loading /usr/lib/xorg/modules/drivers/vesa_drv.so
 
1027
[    14.452] (II) Loading /usr/lib/xorg/modules/drivers/intel_drv.so
 
1028
''')
 
1029
        self.assertEqual(XorgDriverHandler.loaded_drivers(OSLib.inst.workdir),
 
1030
                set(['intel', 'vesa']))
 
1031
 
1011
1032
    def test_firmware_handler(self):
1012
1033
        '''standard FirmwareHandler'''
1013
1034