test: stop local worker socket

Since osbuild-composer release 25 there is now an osbuild-local-worker
socket. This socket is also able to start the osbuild-composer service.
So, in the services test, the local worker socket is now stopped
alongside the osbuild-composer service and socket.

test/verify/check-service

@@ -3,7 +3,7 @@
 # checkpoint:
 # 1. osbuild-composer.socket can be started and enabled
 # 2. no blueprint by default and can add and delete blueprint
-
+import os
 import string
 import random
 
@@ -18,13 +18,18 @@ class TestService(composerlib.ComposerCase):
         # remove all blueprints
         # stop and disable osbuild-composer.socket service
         super().setUp()
+        m = self.machine
+        distro = os.environ.get("TEST_OS")
 
-        self.machine.execute("""
+        m.execute("""
             for bp in $(composer-cli blueprints list); do
                 composer-cli blueprints delete $bp
             done
             systemctl disable --now osbuild-composer.socket osbuild-composer.service
         """)
+        if (distro == "fedora-32" or distro == "fedora-33"):
+            m.execute("systemctl disable --now osbuild-local-worker.socket")
+
 
     def testBasic(self):
         b = self.browser
@@ -110,9 +115,11 @@ class TestService(composerlib.ComposerCase):
     def testNoEnable(self):
         b = self.browser
         m = self.machine
-
-        # stop and disable osbuild-composer.socket
+        distro = os.environ.get("TEST_OS")
+        # stop and disable the osbuild-composer service and sockets
         m.execute("systemctl disable --now osbuild-composer.socket osbuild-composer.service")
+        if (distro == "fedora-32" or distro == "fedora-33"):
+            m.execute("systemctl disable --now osbuild-local-worker.socket")
 
         self.login_and_go("/composer", superuser=True)
         b.wait_present("#main")
@@ -137,9 +144,11 @@ class TestService(composerlib.ComposerCase):
     def testNonAdminUser(self):
         b = self.browser
         m = self.machine
-
-        # stop and disable osbuild-composer.socket
+        distro = os.environ.get("TEST_OS")
+        # stop and disable the osbuild-composer service and sockets
         m.execute("systemctl disable --now osbuild-composer.socket osbuild-composer.service")
+        if (distro == "fedora-32" or distro == "fedora-33"):
+            m.execute("systemctl disable --now osbuild-local-worker.socket")
 
         self.login_and_go("/composer", superuser=False)
         b.wait_present("#main")

test/verify/composerlib.py

@@ -1,5 +1,6 @@
 import json
 import hashlib
+import os
 import pathlib
 
 import parent
@@ -27,6 +28,8 @@ class ComposerCase(testlib.MachineCase):
     def setUp(self):
         super().setUp(restrict=False)
 
+        distro = os.environ.get("TEST_OS")
+
         self.allow_journal_messages(*allowed_journal_messages)
         self.allow_browser_errors(*allowed_browser_errors)
 
@@ -35,9 +38,12 @@ def setUp(self):
 
         # re-start osbuild-composer.socket
         self.machine.execute(script="""#!/bin/sh
-        systemctl stop --quiet osbuild-composer.socket osbuild-composer.service
+        systemctl stop --quiet osbuild-composer.socket osbuild-local-worker.socket osbuild-composer.service
         systemctl start osbuild-composer.socket
         """)
+        if (distro == "fedora-32" or distro == "fedora-33"):
+            self.machine.execute("systemctl disable --now osbuild-local-worker.socket")
+
 
         # push pre-defined blueprint
         self.machine.execute(script="""#!/bin/sh