Merge branch 'master' of /var/ftp/pub/Applications/git/mock

* 'master' of /var/ftp/pub/Applications/git/mock:
  add failsafe for daemontest.c such that it exits after 5 mins rather than hanging around forever.
  add return code propagation test for --chroot cmd.
  let yum resolvedep run w/privs because it has to download additional metadata sometimes.
  fix rebuild multiple srpms test.

2 files changed, 16 insertions, 1 deletions

diff --git a/docs/daemontest.c b/docs/daemontest.c
index f0e7393..5f63e7a 100644
--- a/docs/daemontest.c
+++ b/docs/daemontest.c
@@ -95,7 +95,9 @@ char str[10];
 int main()
 {
     daemonize();
-    while(1) sleep(1); /* run */
+    // run for roughly 5 mins then exit. No need to stick around if unit test fails.
+    int i=0;
+    for( i=0; i<300; i++ ) sleep(1);
 }
 
 /* EOF */
diff --git a/docs/releasetests.sh b/docs/releasetests.sh
index 0d2caa5..ca5c0f7 100755
--- a/docs/releasetests.sh
+++ b/docs/releasetests.sh
@@ -53,6 +53,19 @@ if [ ! -e $CHROOT/usr/include/python* ]; then
 fi
 
 #
+# Test that chroot return code is properly passed up
+#
+set +e
+time $MOCKCMD --offline --chroot 'bash -c "exit 5"'
+if [ $? -ne 5 ]; then
+    echo "'mock --chroot' return code not properly passed back."
+    exit 1
+fi
+set -e
+
+
+
+#
 # Test offline build
 #
 time $MOCKCMD --offline --rebuild mock-*.src.rpm