Imported Debian patch 4.7.2-3

ipatests/man/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -217,8 +217,6 @@ JSLINT = @JSLINT@
 KRAD_LIBS = @KRAD_LIBS@
 KRB5KDC_SERVICE = @KRB5KDC_SERVICE@
 KRB5_CFLAGS = @KRB5_CFLAGS@
-KRB5_GSSAPI_CFLAGS = @KRB5_GSSAPI_CFLAGS@
-KRB5_GSSAPI_LIBS = @KRB5_GSSAPI_LIBS@
 KRB5_LIBS = @KRB5_LIBS@
 LD = @LD@
 LDAP_CFLAGS = @LDAP_CFLAGS@
@@ -261,10 +259,11 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 NSPR_CFLAGS = @NSPR_CFLAGS@
 NSPR_LIBS = @NSPR_LIBS@
+NSS_CFLAGS = @NSS_CFLAGS@
+NSS_LIBS = @NSS_LIBS@
 NUM_VERSION = @NUM_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-ODS_GROUP = @ODS_GROUP@
 ODS_USER = @ODS_USER@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -285,6 +284,8 @@ POPT_LIBS = @POPT_LIBS@
 POSUB = @POSUB@
 PYLINT = @PYLINT@
 PYTHON = @PYTHON@
+PYTHON2 = @PYTHON2@
+PYTHON3 = @PYTHON3@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_INSTALL_EXTRA_OPTIONS = @PYTHON_INSTALL_EXTRA_OPTIONS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
@@ -372,9 +373,7 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
-selinux_makefile = @selinux_makefile@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@

ipatests/man/ipa-run-tests.1

@@ -22,32 +22,42 @@ ipa\-run\-tests \- Run the FreeIPA test suite
 .SH "SYNOPSIS"
 ipa\-run\-tests [options]
 .SH "DESCRIPTION"
-ipa\-run\-tests is a wrapper around Pytest that run the FreeIPA test suite.
+ipa\-run\-tests is a wrapper around nosetests that run the FreeIPA test suite.
 It is intended to be used for developer testing and in continuous
 integration systems.
 
+It loads IPA-internal Nose plugins ordered-tests and beakerlib.
+The ordered-tests plugin is enabled automatically.
+
+The FreeIPA test suite installed system\-wide is selected via Nose's \-\-where
+option.
 It is possible to select a subset of the entire test suite by specifying
 a test file relative to the ipatests package, for example:
 
     ipa-run-tests test_integration/test_simple_replication.py
 
 .SH "OPTIONS"
-All command-line options are passed to the underlying Pytest runner.
-See "pytest --help" for a complete list.
+All command-line options are passed to the underlying Nose runner.
+See nosetests(1) for a complete list.
+
+The internal IPA plugins add an extra option:
+
+.TP
+\fB\-\-with-beakerlib\fR
+Enable BeakerLib integration.
+Test phases, failures and passes, and log messages are reported using
+beakerlib(1) commands.
+This option requires the beakerlib.sh script to be sourced.
 
 .SH "EXIT STATUS"
-Running pytest can result in six different exit codes:
-Exit code 0:	All tests were collected and passed successfully
-Exit code 1:	Tests were collected and run but some of the tests failed
-Exit code 2:	Test execution was interrupted by the user
-Exit code 3:	Internal error happened while executing tests
-Exit code 4:	pytest command line usage error
-Exit code 5:	No tests were collected
+0 if the command was successful
+
+nonzero if any error or failure occurred
 
 .SH "CONFIGURATION"
 Please see ipa-test-config(1) for a description of configuration environment
 variables.
 
 .SH "REFERENCES"
-A full description of the FreeIPA testing is available at
-https://www.freeipa.org/page/Testing
+A full description of the FreeIPA integration testing framework is available at
+http://www.freeipa.org/page/V3/Integration_testing