Unverified Commit 3cdbad2e authored by Jared Baur's avatar Jared Baur
Browse files

nixos/switch-to-configuration: fix dbus implementation used for test 

Makes the switch-test work with both dbus server implementations.
parent 3e67815f

nixos/tests/switch-test.nix

+13 −8
Original line number Diff line number Diff line
@@ -610,6 +610,11 @@ in { 
    # Returns a comma separated representation of the given list in sorted

    # order, that matches the output format of switch-to-configuration.pl

    sortedUnits = xs: lib.concatStringsSep ", " (builtins.sort builtins.lessThan xs);



    dbusService = {

      "dbus" = "dbus.service";

      "broker" = "dbus-broker.service";

    }.${nodes.machine.services.dbus.implementation};

  in /* python */ ''

    def switch_to_specialisation(system, name, action="test", fail=False):

        if name == "":
@@ -691,9 +696,9 @@ in { 
    with subtest("continuing from an aborted switch"):

        # An aborted switch will write into a file what it tried to start

        # and a second switch should continue from this

        machine.succeed("echo dbus-broker.service > /run/nixos/start-list")

        machine.succeed("echo ${dbusService} > /run/nixos/start-list")

        out = switch_to_specialisation("${machine}", "modifiedSystemConf")

        assert_contains(out, "starting the following units: dbus-broker.service\n")

        assert_contains(out, "starting the following units: ${dbusService}\n")



    with subtest("fstab mounts"):

        switch_to_specialisation("${machine}", "")
@@ -732,7 +737,7 @@ in { 
        out = switch_to_specialisation("${machine}", "")

        assert_contains(out, "stopping the following units: test.mount\n")

        assert_lacks(out, "NOT restarting the following changed units:")

        assert_contains(out, "reloading the following units: dbus-broker.service\n")

        assert_contains(out, "reloading the following units: ${dbusService}\n")

        assert_lacks(out, "\nrestarting the following units:")

        assert_lacks(out, "\nstarting the following units:")

        assert_lacks(out, "the following new units were started:")
@@ -740,7 +745,7 @@ in { 
        out = switch_to_specialisation("${machine}", "storeMountModified")

        assert_lacks(out, "stopping the following units:")

        assert_contains(out, "NOT restarting the following changed units: -.mount")

        assert_contains(out, "reloading the following units: dbus-broker.service\n")

        assert_contains(out, "reloading the following units: ${dbusService}\n")

        assert_lacks(out, "\nrestarting the following units:")

        assert_lacks(out, "\nstarting the following units:")

        assert_lacks(out, "the following new units were started:")
@@ -751,7 +756,7 @@ in { 
        out = switch_to_specialisation("${machine}", "swap")

        assert_lacks(out, "stopping the following units:")

        assert_lacks(out, "NOT restarting the following changed units:")

        assert_contains(out, "reloading the following units: dbus-broker.service\n")

        assert_contains(out, "reloading the following units: ${dbusService}\n")

        assert_lacks(out, "\nrestarting the following units:")

        assert_lacks(out, "\nstarting the following units:")

        assert_contains(out, "the following new units were started: swapfile.swap")
@@ -760,7 +765,7 @@ in { 
        assert_contains(out, "stopping swap device: /swapfile")

        assert_lacks(out, "stopping the following units:")

        assert_lacks(out, "NOT restarting the following changed units:")

        assert_contains(out, "reloading the following units: dbus-broker.service\n")

        assert_contains(out, "reloading the following units: ${dbusService}\n")

        assert_lacks(out, "\nrestarting the following units:")

        assert_lacks(out, "\nstarting the following units:")

        assert_lacks(out, "the following new units were started:")
@@ -781,7 +786,7 @@ in { 
        assert_lacks(out, "installing dummy bootloader")  # test does not install a bootloader

        assert_lacks(out, "stopping the following units:")

        assert_lacks(out, "NOT restarting the following changed units:")

        assert_contains(out, "reloading the following units: dbus-broker.service\n")  # huh

        assert_contains(out, "reloading the following units: ${dbusService}\n")  # huh

        assert_lacks(out, "\nrestarting the following units:")

        assert_lacks(out, "\nstarting the following units:")

        assert_contains(out, "the following new units were started: test.service\n")
@@ -858,7 +863,7 @@ in { 
        assert_lacks(out, "installing dummy bootloader")  # test does not install a bootloader

        assert_lacks(out, "stopping the following units:")

        assert_lacks(out, "NOT restarting the following changed units:")

        assert_contains(out, "reloading the following units: dbus-broker.service\n")  # huh

        assert_contains(out, "reloading the following units: ${dbusService}\n")  # huh

        assert_lacks(out, "\nrestarting the following units:")

        assert_lacks(out, "\nstarting the following units:")

        assert_contains(out, "the following new units were started: test.service\n")