homectl,TEST-46: fix test and fix homectl return value, update docs

keszybz · keszybz · commit b9bfa250f2c0 · 2021-04-08T20:21:50.000+02:00
The usual: the test wasn't testing, so we didn't notice that the
command wasn't returning as expected.
diff --git a/man/homectl.xml b/man/homectl.xml
@@ -846,6 +846,10 @@
     <title>Exit status</title>
 
     <para>On success, 0 is returned, a non-zero failure code otherwise.</para>
+
+    <para>When a command is invoked with <command>with</command>, the exit status of the child is
+    propagated. Effectively, <command>homectl</command> will exit without error if the command is
+    successfully invoked <emphasis>and</emphasis> finishes successfully.</para>
   </refsect1>
 
   <xi:include href="common-variables.xml" />
diff --git a/src/home/homectl.c b/src/home/homectl.c
@@ -3362,4 +3362,4 @@ static int run(int argc, char *argv[]) {
         return dispatch_verb(argc, argv, verbs, NULL);
 }
 
-DEFINE_MAIN_FUNCTION(run);
+DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);
diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh
@@ -66,11 +66,15 @@ inspect test-user
 PASSWORD=xEhErW0ndafV4s homectl deactivate test-user
 inspect test-user
 
-! PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz
+PASSWORD=xEhErW0ndafV4s homectl with test-user -- test ! -f /home/test-user/xyz
+PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz \
+    && { echo 'unexpected success'; exit 1; }
 PASSWORD=xEhErW0ndafV4s homectl with test-user -- touch /home/test-user/xyz
 PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz
 PASSWORD=xEhErW0ndafV4s homectl with test-user -- rm /home/test-user/xyz
-! PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz
+PASSWORD=xEhErW0ndafV4s homectl with test-user -- test ! -f /home/test-user/xyz
+PASSWORD=xEhErW0ndafV4s homectl with test-user -- test -f /home/test-user/xyz \
+    && { echo 'unexpected success'; exit 1; }
 
 homectl remove test-user
 

Original file line number	Diff line number	Diff line change
`@@ -3362,4 +3362,4 @@ static int run(int argc, char *argv[]) {`
`3362`	`3362`	`return dispatch_verb(argc, argv, verbs, NULL);`
`3363`	`3363`	`}`
`3364`	`3364`
`3365`		`-DEFINE_MAIN_FUNCTION(run);`
	`3365`	`+DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);`