From df1172fe726422a46f36c992c5553698657a9bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 2 Dec 2017 15:40:30 +0100 Subject: [PATCH] test-systemd-tmpfiles: ignore result of %m test It's failing on artful s390x and i386: Running /tmp/autopkgtest.Pexzdu/build.lfO/debian/build-deb/systemd-tmpfiles on 'f /tmp/test-systemd-tmpfiles.c236s1uq/arg - - - - %m' expect: '01234567890123456789012345678901' actual: 'e84bc78d162e472a8ac9759f5f1e4e0e' --- stderr --- Traceback (most recent call last): File "/tmp/autopkgtest.Pexzdu/build.lfO/debian/src/test/test-systemd-tmpfiles.py", line 129, in test_valid_specifiers(user=False) File "/tmp/autopkgtest.Pexzdu/build.lfO/debian/src/test/test-systemd-tmpfiles.py", line 89, in test_valid_specifiers test_content('f {} - - - - %m', '{}'.format(id128.get_machine().hex), user=user) File "/tmp/autopkgtest.Pexzdu/build.lfO/debian/src/test/test-systemd-tmpfiles.py", line 84, in test_content assert content == expected AssertionError ------- Let's skip the test for now until this is resolved properly on the autopkgtest side. --- src/test/test-systemd-tmpfiles.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/test-systemd-tmpfiles.py b/src/test/test-systemd-tmpfiles.py index 1368839381..00362c6952 100755 --- a/src/test/test-systemd-tmpfiles.py +++ b/src/test/test-systemd-tmpfiles.py @@ -86,7 +86,13 @@ def test_content(line, expected, *, user, extra={}): def test_valid_specifiers(*, user): test_content('f {} - - - - two words', 'two words', user=user) if id128: - test_content('f {} - - - - %m', '{}'.format(id128.get_machine().hex), user=user) + try: + test_content('f {} - - - - %m', '{}'.format(id128.get_machine().hex), user=user) + except AssertionError as e: + print(e) + print('/etc/machine-id: {!r}'.format(open('/etc/machine-id').read())) + print('/proc/cmdline: {!r}'.format(open('/proc/cmdline').read())) + print('skipping') test_content('f {} - - - - %b', '{}'.format(id128.get_boot().hex), user=user) test_content('f {} - - - - %H', '{}'.format(socket.gethostname()), user=user) test_content('f {} - - - - %v', '{}'.format(os.uname().release), user=user)