nixosTests.fancontrol: fix test; clean up module

nixos/modules/services/hardware/fancontrol.nix

@@ -6,21 +6,21 @@ let
  cfg = config.hardware.fancontrol;
  configFile = pkgs.writeText "fancontrol.conf" cfg.config;
 
-in{
+in
+{
  options.hardware.fancontrol = {
  enable = mkEnableOption "software fan control (requires fancontrol.config)";
 
  config = mkOption {
- default = null;
- type = types.nullOr types.lines;
- description = "Fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package.";
+ type = types.lines;
+ description = "Required fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package.";
  example = ''
  # Configuration file generated by pwmconfig
  INTERVAL=10
  DEVPATH=hwmon3=devices/virtual/thermal/thermal_zone2 hwmon4=devices/platform/f71882fg.656
  DEVNAME=hwmon3=soc_dts1 hwmon4=f71869a
  FCTEMPS=hwmon4/device/pwm1=hwmon3/temp1_input
- FCFANS= hwmon4/device/pwm1=hwmon4/device/fan1_input
+ FCFANS=hwmon4/device/pwm1=hwmon4/device/fan1_input
  MINTEMP=hwmon4/device/pwm1=35
  MAXTEMP=hwmon4/device/pwm1=65
  MINSTART=hwmon4/device/pwm1=150
@@ -30,16 +30,30 @@ in{
  };
 
  config = mkIf cfg.enable {
+
+ users = {
+ groups.lm_sensors = {};
+
+ users.fancontrol = {
+ isSystemUser = true;
+ group = "lm_sensors";
+ description = "fan speed controller";
+ };
+ };
+
  systemd.services.fancontrol = {
- unitConfig.Documentation = "man:fancontrol(8)";
+ documentation = [ "man:fancontrol(8)" ];
  description = "software fan control";
  wantedBy = [ "multi-user.target" ];
  after = [ "lm_sensors.service" ];
 
  serviceConfig = {
- Type = "simple";
  ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}";
+ Group = "lm_sensors";
+ User = "fancontrol";
  };
  };
  };
+
+ meta.maintainers = [ maintainers.evils ];
 }

nixos/tests/fancontrol.nix

@@ -1,28 +1,34 @@
 import ./make-test-python.nix ({ pkgs, ... } : {
  name = "fancontrol";
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ evils ];
+ };
 
- machine =
- { ... }:
- { hardware.fancontrol.enable = true;
-  hardware.fancontrol.config = ''
-  INTERVAL=42
-  DEVPATH=hwmon1=devices/platform/dummy
-  DEVNAME=hwmon1=dummy
-  FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input
-  FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input
-  MINTEMP=hwmon1/device/pwm1=25
-  MAXTEMP=hwmon1/device/pwm1=65
-  MINSTART=hwmon1/device/pwm1=150
-  MINSTOP=hwmon1/device/pwm1=0
-  '';
+ machine = { ... }: {
+ imports = [ ../modules/profiles/minimal.nix ];
+ hardware.fancontrol.enable = true;
+ hardware.fancontrol.config = ''
+ INTERVAL=42
+ DEVPATH=hwmon1=devices/platform/dummy
+ DEVNAME=hwmon1=dummy
+ FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input
+ FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input
+ MINTEMP=hwmon1/device/pwm1=25
+ MAXTEMP=hwmon1/device/pwm1=65
+ MINSTART=hwmon1/device/pwm1=150
+ MINSTOP=hwmon1/device/pwm1=0
+ '';
  };
 
  # This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error.
  testScript = ''
  start_all()
- machine.wait_for_unit("fancontrol.service")
- machine.wait_until_succeeds(
- "journalctl -eu fancontrol | grep 'Configuration appears to be outdated'"
+ # can't wait for unit fancontrol.service because it doesn't become active due to invalid config
+ # fancontrol.service is WantedBy multi-user.target
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed(
+ "journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'"
  )
+ machine.shutdown()
  '';
 })