170 lines
6.5 KiB
Diff
170 lines
6.5 KiB
Diff
From 7e4820c6e99d4f696f083e3e5ee78bb868985bbb Mon Sep 17 00:00:00 2001
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
|
Date: Fri, 31 Jan 2020 18:49:33 +0000
|
|
Subject: [PATCH] Adjust dbus-python output more for python 3.8
|
|
|
|
The dbus output changed in due to an upstream bug. It seems that
|
|
the behavior changed with the last respin of python3-dbus.
|
|
|
|
https://gitlab.freedesktop.org/dbus/dbus-python/issues/31
|
|
---
|
|
tests/028-dbus/expected.out | 36 ++++++++++++++++++------------------
|
|
1 file changed, 18 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/tests/028-dbus/expected.out b/tests/028-dbus/expected.out
|
|
index 9f05e0e..82e5b7d 100644
|
|
--- a/tests/028-dbus/expected.out
|
|
+++ b/tests/028-dbus/expected.out
|
|
@@ -47,7 +47,7 @@ CA 'dogtag-ipa-renew-agent':
|
|
/org/fedorahosted/certmonger/cas/CA6
|
|
/org/fedorahosted/certmonger/cas/CA6
|
|
: -> : -k admin@localhost -> :
|
|
-0 -> 1 -> 0
|
|
+dbus.Boolean(False, variant_level=1) -> dbus.Boolean(True, variant_level=1) -> dbus.Boolean(False, variant_level=1)
|
|
[ walk.py ]
|
|
[ /: org.freedesktop.DBus.Introspectable.Introspect ]
|
|
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
|
@@ -426,7 +426,7 @@ OK
|
|
Buddy
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.get_autorenew ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.get_cert_data ]
|
|
|
|
@@ -436,7 +436,7 @@ Buddy
|
|
(dbus.String('CN=$UUID,CN=Local Signing Authority'), dbus.String('$UUID'), dbus.String('CN=localhost'), dbus.Int64(tomorrow), dbus.Array([], signature=dbus.Signature('s')), dbus.Array([dbus.String('localhost')], signature=dbus.Signature('s')), dbus.Array([dbus.String('host/localhost@LOCALHOST')], signature=dbus.Signature('s')), dbus.Int64(9), dbus.Array([dbus.String('1.3.6.1.5.5.7.3.1')], signature=dbus.Signature('s')))
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.get_cert_last_checked ]
|
|
-recently
|
|
+dbus.Int64(recently)
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.get_cert_storage_info ]
|
|
(dbus.String('FILE'), dbus.String('$tmpdir/test.crt'))
|
|
@@ -460,7 +460,7 @@ recently
|
|
(dbus.String('RSA'), dbus.Int64(512))
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.get_monitoring ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.get_notification_info ]
|
|
(dbus.String('stdout'), dbus.String('daemon.notice'))
|
|
@@ -478,20 +478,20 @@ None
|
|
None
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.get_submitted_date ]
|
|
-recently
|
|
+dbus.Int64(recently)
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2 : org.fedorahosted.certmonger.request.modify ]
|
|
1 on /org/fedorahosted/certmonger/requests/Request2
|
|
After setting template-eku to 1.2.3.4.5.6.7.8.9.10, we got dbus.Array([dbus.String('1.2.3.4.5.6.7.8.9.10')], signature=dbus.Signature('s'), variant_level=1)
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.rekey ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.resubmit ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
[ /org/fedorahosted/certmonger/requests/Request2: org.fedorahosted.certmonger.request.refresh ]
|
|
-0
|
|
+dbus.Boolean(False)
|
|
|
|
[ /org/fedorahosted/certmonger/cas: org.freedesktop.DBus.Introspectable.Introspect ]
|
|
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
|
@@ -606,7 +606,7 @@ $tmpdir/cas/local
|
|
local
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA1: org.fedorahosted.certmonger.ca.get_is_default ]
|
|
-0
|
|
+dbus.Boolean(False)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA1: org.fedorahosted.certmonger.ca.get_type ]
|
|
EXTERNAL
|
|
@@ -621,7 +621,7 @@ $tmpdir/local-submit
|
|
dbus.Array([], signature=dbus.Signature('s'))
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA1: org.fedorahosted.certmonger.ca.refresh ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA2: org.freedesktop.DBus.Introspectable.Introspect ]
|
|
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
|
@@ -719,7 +719,7 @@ $tmpdir/cas/20180327134236
|
|
SelfSign
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA2: org.fedorahosted.certmonger.ca.get_is_default ]
|
|
-0
|
|
+dbus.Boolean(False)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA2: org.fedorahosted.certmonger.ca.get_type ]
|
|
INTERNAL:SELF
|
|
@@ -735,7 +735,7 @@ INTERNAL:SELF
|
|
dbus.Array([], signature=dbus.Signature('s'))
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA2: org.fedorahosted.certmonger.ca.refresh ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
/org/fedorahosted/certmonger/cas/CA2: property org.fedorahosted.certmonger.ca.scep-cipher not set: (, x)
|
|
[ /org/fedorahosted/certmonger/cas/CA3: org.freedesktop.DBus.Introspectable.Introspect ]
|
|
@@ -834,7 +834,7 @@ $tmpdir/cas/20180327134236-1
|
|
IPA
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA3: org.fedorahosted.certmonger.ca.get_is_default ]
|
|
-0
|
|
+dbus.Boolean(False)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA3: org.fedorahosted.certmonger.ca.get_type ]
|
|
EXTERNAL
|
|
@@ -849,7 +849,7 @@ $libexecdir/ipa-submit
|
|
dbus.Array([], signature=dbus.Signature('s'))
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA3: org.fedorahosted.certmonger.ca.refresh ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA4: org.freedesktop.DBus.Introspectable.Introspect ]
|
|
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
|
@@ -947,7 +947,7 @@ $tmpdir/cas/20180327134236-2
|
|
certmaster
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA4: org.fedorahosted.certmonger.ca.get_is_default ]
|
|
-0
|
|
+dbus.Boolean(False)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA4: org.fedorahosted.certmonger.ca.get_type ]
|
|
EXTERNAL
|
|
@@ -962,7 +962,7 @@ $libexecdir/certmaster-submit
|
|
dbus.Array([], signature=dbus.Signature('s'))
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA4: org.fedorahosted.certmonger.ca.refresh ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA5: org.freedesktop.DBus.Introspectable.Introspect ]
|
|
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
|
@@ -1060,7 +1060,7 @@ $tmpdir/cas/20180327134236-3
|
|
dogtag-ipa-renew-agent
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA5: org.fedorahosted.certmonger.ca.get_is_default ]
|
|
-0
|
|
+dbus.Boolean(False)
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA5: org.fedorahosted.certmonger.ca.get_type ]
|
|
EXTERNAL
|
|
@@ -1075,5 +1075,5 @@ $libexecdir/dogtag-ipa-renew-agent-submit
|
|
dbus.Array([], signature=dbus.Signature('s'))
|
|
|
|
[ /org/fedorahosted/certmonger/cas/CA5: org.fedorahosted.certmonger.ca.refresh ]
|
|
-1
|
|
+dbus.Boolean(True)
|
|
|
|
--
|
|
2.25.0
|
|
|