pyrox.dev
1diff --git a/Makefile b/Makefile
2index 821a9500..75affa77 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -25,12 +25,12 @@ release: build-source upload upload-ppa
6
7 test:
8 rm tests/fixtures/pga.db -f
9- nosetests3
10+ nosetests
11
12 cover:
13 rm tests/fixtures/pga.db -f
14 rm tests/coverage/ -rf
15- nosetests3 --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage
16+ nosetests --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage
17
18 pgp-renew:
19 osc signkey --extend home:strycore
20diff --git a/lutris/util/graphics/xrandr.py b/lutris/util/graphics/xrandr.py
21index f788c94c..5544dbe9 100644
22--- a/lutris/util/graphics/xrandr.py
23+++ b/lutris/util/graphics/xrandr.py
24@@ -5,6 +5,7 @@ from collections import namedtuple
25
26 from lutris.util.log import logger
27 from lutris.util.system import read_process_output
28+from lutris.util.linux import LINUX_SYSTEM
29
30 Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary", "rate"))
31
32@@ -12,7 +13,7 @@ Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary"
33 def _get_vidmodes():
34 """Return video modes from XrandR"""
35 logger.debug("Retrieving video modes from XrandR")
36- return read_process_output(["xrandr"]).split("\n")
37+ return read_process_output([LINUX_SYSTEM.get("xrandr")]).split("\n")
38
39
40 def get_outputs(): # pylint: disable=too-many-locals
41@@ -76,7 +77,7 @@ def turn_off_except(display):
42 for output in get_outputs():
43 if output.name != display:
44 logger.info("Turning off %s", output[0])
45- subprocess.Popen(["xrandr", "--output", output.name, "--off"])
46+ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "--output", output.name, "--off"])
47
48
49 def get_resolutions():
50@@ -111,7 +112,7 @@ def change_resolution(resolution):
51 logger.warning("Resolution %s doesn't exist.", resolution)
52 else:
53 logger.info("Changing resolution to %s", resolution)
54- subprocess.Popen(["xrandr", "-s", resolution])
55+ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "-s", resolution])
56 else:
57 for display in resolution:
58 logger.debug("Switching to %s on %s", display.mode, display.name)
59@@ -128,7 +129,7 @@ def change_resolution(resolution):
60 logger.info("Switching resolution of %s to %s", display.name, display.mode)
61 subprocess.Popen(
62 [
63- "xrandr",
64+ LINUX_SYSTEM.get("xrandr"),
65 "--output",
66 display.name,
67 "--mode",