From owner-svn-src-all@FreeBSD.ORG  Sun Feb 15 21:42:11 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 89C7D3CF;
 Sun, 15 Feb 2015 21:42:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 741EEC28;
 Sun, 15 Feb 2015 21:42:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1FLgB5f074366;
 Sun, 15 Feb 2015 21:42:11 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1FLgBmG074365;
 Sun, 15 Feb 2015 21:42:11 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201502152142.t1FLgBmG074365@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Sun, 15 Feb 2015 21:42:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278819 - head/usr.sbin/pw/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Feb 2015 21:42:11 -0000

Author: brd (doc committer)
Date: Sun Feb 15 21:42:10 2015
New Revision: 278819
URL: https://svnweb.freebsd.org/changeset/base/278819

Log:
  Really fix the pw_usernext tests.
  
  PR:		197612
  Approved by:	will

Modified:
  head/usr.sbin/pw/tests/pw_usernext.sh

Modified: head/usr.sbin/pw/tests/pw_usernext.sh
==============================================================================
--- head/usr.sbin/pw/tests/pw_usernext.sh	Sun Feb 15 21:41:29 2015	(r278818)
+++ head/usr.sbin/pw/tests/pw_usernext.sh	Sun Feb 15 21:42:10 2015	(r278819)
@@ -8,14 +8,15 @@ atf_test_case usernext
 usernext_body() {
 	populate_etc_skel
 
-	var0=1
-	LIMIT=`jot -r 1 2 10`
-	while [ "$var0" -lt "$LIMIT" ]
+	CURRENT=`${PW} usernext | sed -e 's/:.*//'`
+	RANDOM=`jot -r 1 1 150`
+	MAX=`expr ${CURRENT} + ${RANDOM}`
+	while [ "${CURRENT}" -lt "${MAX}" ]
 	do
-		atf_check -s exit:0 ${PW} useradd test$var0
-		var0=`expr $var0 + 1`
+		atf_check -s exit:0 ${PW} useradd test${CURRENT}
+		CURRENT=`expr ${CURRENT} + 1`
 	done
-	atf_check -s exit:0 -o match:"100${LIMIT}:100${LIMIT}" \
+	atf_check -s exit:0 -o match:"${CURRENT}:${CURRENT}" \
 		${PW} usernext
 }
 
@@ -25,14 +26,16 @@ atf_test_case usernext_assigned_group
 usernext_assigned_group_body() {
 	populate_etc_skel
 
-	var0=1
-	LIMIT=`jot -r 1 2 10`
-	while [ "$var0" -lt "$LIMIT" ]
+	CURRENT=`${PW} usernext | sed -e 's/:.*//'`
+	CURRENTGID=`${PW} groupnext`
+	RANDOM=`jot -r 1 1 150`
+	MAX=`expr ${CURRENT} + ${RANDOM}`
+	while [ "${CURRENT}" -lt "${MAX}" ]
 	do
-		atf_check -s exit:0 ${PW} useradd -n test$var0 -g 0
-		var0=`expr $var0 + 1`
+		atf_check -s exit:0 ${PW} useradd -n test${CURRENT} -g 0
+		CURRENT=`expr ${CURRENT} + 1`
 	done
-	atf_check -s exit:0 -o match:"100${LIMIT}:1001" \
+	atf_check -s exit:0 -o match:"${CURRENT}:${CURRENTGID}" \
 		${PW} usernext
 }