napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[displaymanager] Adjust tests to match real runtime

Browse Source 
- the default_desktop_environment isn't a string, but an
  object; it is unusual for it to be used in set_autologin
This commit is contained in:
Adriaan de Groot 2021-11-15 13:37:23 +01:00
parent f3e85efd41
commit 16a029abd2
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/displaymanager/tests/test-dm-greetd.py
View File

@ -2,17 +2,21 @@
import libcalamares import libcalamares
libcalamares.globalstorage = libcalamares.GlobalStorage(None) libcalamares.globalstorage = libcalamares.GlobalStorage(None)
libcalamares.globalstorage.insert("testing", True) libcalamares.globalstorage.insert("testing", True)
# Module prep-work # Module prep-work
from src.modules.displaymanager import main
default_desktop_environment = main.DesktopEnvironment("startplasma-x11", "kde-plasma.desktop")
import os import os
os.makedirs("/tmp/etc/greetd/", exist_ok=True) os.makedirs("/tmp/etc/greetd/", exist_ok=True)
try: try:
os.remove("/tmp/etc/greetd/config.toml") os.remove("/tmp/etc/greetd/config.toml")
except FileNotFoundError as e: except FileNotFoundError as e:
pass pass
# Module test
from src.modules.displaymanager import main # Specific DM test
d = main.DMgreetd("/tmp") d = main.DMgreetd("/tmp")
d.set_autologin("d", True, "kde") d.set_autologin("d", True, default_desktop_environment)
# .. and again (this time checks load/save) # .. and again (this time checks load/save)
d.set_autologin("d", True, "kde") d.set_autologin("d", True, default_desktop_environment)
d.set_autologin("d", True, "kde") d.set_autologin("d", True, default_desktop_environment)

11
src/modules/displaymanager/tests/test-dm-sddm.py
View File

@ -2,11 +2,14 @@
import libcalamares import libcalamares
libcalamares.globalstorage = libcalamares.GlobalStorage(None) libcalamares.globalstorage = libcalamares.GlobalStorage(None)
libcalamares.globalstorage.insert("testing", True) libcalamares.globalstorage.insert("testing", True)
# Module prep-work # Module prep-work
# Module test
from src.modules.displaymanager import main from src.modules.displaymanager import main
default_desktop_environment = main.DesktopEnvironment("startplasma-x11", "kde-plasma.desktop")
# Specific DM test
d = main.DMsddm("/tmp") d = main.DMsddm("/tmp")
d.set_autologin("d", True, "kde") d.set_autologin("d", True, default_desktop_environment)
# .. and again (this time checks load/save) # .. and again (this time checks load/save)
d.set_autologin("d", True, "kde") d.set_autologin("d", True, default_desktop_environment)
d.set_autologin("d", True, "kde") d.set_autologin("d", True, default_desktop_environment)