#123 Sync nodsa expectations in dbus tests
Merged 6 months ago by rcritten. Opened 6 months ago by slev.
slev/certmonger fix_nodsa_tests  into  master

@@ -330,6 +330,7 @@ 

    <property name="template-ns-comment" type="s" access="readwrite"/>

    <property name="template-profile" type="s" access="readwrite"/>

    <property name="template-issuer" type="s" access="readwrite"/>

+   <property name="template-ms-certificate-template" type="s" access="readwrite"/>

    <property name="template-ns-certtype" type="s" access="readwrite"/>

    <property name="template-challenge-password" type="s" access="readwrite"/>

    <property name="template-challenge-password-file" type="s" access="readwrite"/>

@@ -541,6 +542,9 @@ 

    </signal>

   </interface>

   <interface name="org.fedorahosted.certmonger.ca">

+   <method name="get_config_file_path">

+    <arg name="path" type="s" direction="out"/>

+   </method>

    <method name="get_nickname">

     <arg name="nickname" type="s" direction="out"/>

    </method>

@@ -585,6 +589,8 @@ 

    <property name="ca-presave-uid" type="s" access="read"/>

    <property name="ca-postsave-command" type="s" access="read"/>

    <property name="ca-postsave-uid" type="s" access="read"/>

+   <property name="scep-cipher" type="s" access="readwrite"/>

+   <property name="scep-digest" type="s" access="readwrite"/>

    <property name="scep-ca-identifier" type="s" access="readwrite"/>

    <property name="scep-ca-capabilities" type="as" access="read"/>

    <property name="scep-ra-cert" type="s" access="read"/>

@@ -593,6 +599,9 @@ 

   </interface>

  </node>

  

+ [ /org/fedorahosted/certmonger/cas/CA1: org.fedorahosted.certmonger.ca.get_config_file_path ]

+ $tmpdir/cas/local

+ 

  [ /org/fedorahosted/certmonger/cas/CA1: org.fedorahosted.certmonger.ca.get_nickname ]

  local

  

@@ -646,6 +655,9 @@ 

    </signal>

   </interface>

   <interface name="org.fedorahosted.certmonger.ca">

+   <method name="get_config_file_path">

+    <arg name="path" type="s" direction="out"/>

+   </method>

    <method name="get_nickname">

     <arg name="nickname" type="s" direction="out"/>

    </method>

@@ -690,6 +702,8 @@ 

    <property name="ca-presave-uid" type="s" access="read"/>

    <property name="ca-postsave-command" type="s" access="read"/>

    <property name="ca-postsave-uid" type="s" access="read"/>

+   <property name="scep-cipher" type="s" access="readwrite"/>

+   <property name="scep-digest" type="s" access="readwrite"/>

    <property name="scep-ca-identifier" type="s" access="readwrite"/>

    <property name="scep-ca-capabilities" type="as" access="read"/>

    <property name="scep-ra-cert" type="s" access="read"/>

@@ -698,6 +712,9 @@ 

   </interface>

  </node>

  

+ [ /org/fedorahosted/certmonger/cas/CA2: org.fedorahosted.certmonger.ca.get_config_file_path ]

+ $tmpdir/cas/20180327134236

+ 

  [ /org/fedorahosted/certmonger/cas/CA2: org.fedorahosted.certmonger.ca.get_nickname ]

  SelfSign

  

@@ -720,7 +737,7 @@ 

  [ /org/fedorahosted/certmonger/cas/CA2: org.fedorahosted.certmonger.ca.refresh ]

  1

  

- /org/fedorahosted/certmonger/cas/CA2: warning: property org.fedorahosted.certmonger.ca.scep-ca-identifier not settable on this object

+ /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 ]

  <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"

  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">

@@ -753,6 +770,9 @@ 

    </signal>

   </interface>

   <interface name="org.fedorahosted.certmonger.ca">

+   <method name="get_config_file_path">

+    <arg name="path" type="s" direction="out"/>

+   </method>

    <method name="get_nickname">

     <arg name="nickname" type="s" direction="out"/>

    </method>

@@ -797,6 +817,8 @@ 

    <property name="ca-presave-uid" type="s" access="read"/>

    <property name="ca-postsave-command" type="s" access="read"/>

    <property name="ca-postsave-uid" type="s" access="read"/>

+   <property name="scep-cipher" type="s" access="readwrite"/>

+   <property name="scep-digest" type="s" access="readwrite"/>

    <property name="scep-ca-identifier" type="s" access="readwrite"/>

    <property name="scep-ca-capabilities" type="as" access="read"/>

    <property name="scep-ra-cert" type="s" access="read"/>

@@ -805,6 +827,9 @@ 

   </interface>

  </node>

  

+ [ /org/fedorahosted/certmonger/cas/CA3: org.fedorahosted.certmonger.ca.get_config_file_path ]

+ $tmpdir/cas/20180327134236-1

+ 

  [ /org/fedorahosted/certmonger/cas/CA3: org.fedorahosted.certmonger.ca.get_nickname ]

  IPA

  

@@ -858,6 +883,9 @@ 

    </signal>

   </interface>

   <interface name="org.fedorahosted.certmonger.ca">

+   <method name="get_config_file_path">

+    <arg name="path" type="s" direction="out"/>

+   </method>

    <method name="get_nickname">

     <arg name="nickname" type="s" direction="out"/>

    </method>

@@ -902,6 +930,8 @@ 

    <property name="ca-presave-uid" type="s" access="read"/>

    <property name="ca-postsave-command" type="s" access="read"/>

    <property name="ca-postsave-uid" type="s" access="read"/>

+   <property name="scep-cipher" type="s" access="readwrite"/>

+   <property name="scep-digest" type="s" access="readwrite"/>

    <property name="scep-ca-identifier" type="s" access="readwrite"/>

    <property name="scep-ca-capabilities" type="as" access="read"/>

    <property name="scep-ra-cert" type="s" access="read"/>

@@ -910,6 +940,9 @@ 

   </interface>

  </node>

  

+ [ /org/fedorahosted/certmonger/cas/CA4: org.fedorahosted.certmonger.ca.get_config_file_path ]

+ $tmpdir/cas/20180327134236-2

+ 

  [ /org/fedorahosted/certmonger/cas/CA4: org.fedorahosted.certmonger.ca.get_nickname ]

  certmaster

  

@@ -963,6 +996,9 @@ 

    </signal>

   </interface>

   <interface name="org.fedorahosted.certmonger.ca">

+   <method name="get_config_file_path">

+    <arg name="path" type="s" direction="out"/>

+   </method>

    <method name="get_nickname">

     <arg name="nickname" type="s" direction="out"/>

    </method>

@@ -1007,6 +1043,8 @@ 

    <property name="ca-presave-uid" type="s" access="read"/>

    <property name="ca-postsave-command" type="s" access="read"/>

    <property name="ca-postsave-uid" type="s" access="read"/>

+   <property name="scep-cipher" type="s" access="readwrite"/>

+   <property name="scep-digest" type="s" access="readwrite"/>

    <property name="scep-ca-identifier" type="s" access="readwrite"/>

    <property name="scep-ca-capabilities" type="as" access="read"/>

    <property name="scep-ra-cert" type="s" access="read"/>

@@ -1015,6 +1053,9 @@ 

   </interface>

  </node>

  

+ [ /org/fedorahosted/certmonger/cas/CA5: org.fedorahosted.certmonger.ca.get_config_file_path ]

+ $tmpdir/cas/20180327134236-3

+ 

  [ /org/fedorahosted/certmonger/cas/CA5: org.fedorahosted.certmonger.ca.get_nickname ]

  dogtag-ipa-renew-agent

  

file modified
+3 -1

@@ -90,7 +90,9 @@ 

  			done

  			if test $stat -eq 1 ; then

  				echo "FAIL"

- 				diff -u expected.out "$tmpfile" | sed s,"^\+\+\+ $tmpfile","+++ actual",g

+ 				for i in expected.out* ; do

+ 					diff -u "$tmpfile" "$i" -I "tmpdir/cas/[[:digit:]]\+" | sed s,"^\+\+\+ $tmpfile","+++ actual",g

+ 				done

  				cp $tmpfile "$builddir"/"$testid"/actual.out

  				cp "$tmpdir"/errors "$builddir"/"$testid"/actual.err

  			fi

This simply syncs tests/028-dbus/expected.out.nodsa with tests/028-dbus/expected.out.
Additionally, in failure cases, all diffs are output.

Fixes: https://pagure.io/certmonger/issue/122

Pull-Request has been merged by rcritten

6 months ago