From owner-svn-soc-all@FreeBSD.ORG  Fri Sep 13 22:22:41 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8294D9BE
 for <svn-soc-all@FreeBSD.org>; Fri, 13 Sep 2013 22:22:41 +0000 (UTC)
 (envelope-from mattbw@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6FAC42B00
 for <svn-soc-all@FreeBSD.org>; Fri, 13 Sep 2013 22:22:41 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8DMMfJY077921
 for <svn-soc-all@FreeBSD.org>; Fri, 13 Sep 2013 22:22:41 GMT
 (envelope-from mattbw@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8DMMfxA077915
 for svn-soc-all@FreeBSD.org; Fri, 13 Sep 2013 22:22:41 GMT
 (envelope-from mattbw@FreeBSD.org)
Date: Fri, 13 Sep 2013 22:22:41 GMT
Message-Id: <201309132222.r8DMMfxA077915@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 mattbw@FreeBSD.org using -f
From: mattbw@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r257287 - soc2013/mattbw/tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Sep 2013 22:22:41 -0000

Author: mattbw
Date: Fri Sep 13 22:22:41 2013
New Revision: 257287
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257287

Log:
  Add file listing check to the install/remove functional test.
  
  Doing this has revealed  that the file list-when-not-installed case no
  longer spits out an error.  I should rectify this.
  

Modified:
  soc2013/mattbw/tests/ftest-install-remove-single.sh

Modified: soc2013/mattbw/tests/ftest-install-remove-single.sh
==============================================================================
--- soc2013/mattbw/tests/ftest-install-remove-single.sh	Fri Sep 13 22:08:12 2013	(r257286)
+++ soc2013/mattbw/tests/ftest-install-remove-single.sh	Fri Sep 13 22:22:41 2013	(r257287)
@@ -35,6 +35,21 @@
 	exit
 fi
 
+# Now check to see if the correct files come up on a file list
+pkcon get-files testpkg > files
+DIFF=`diff -rupN - files << EOF
+Package files
+  /usr/local/testpkgs/testfile
+  /usr/local/testpkgs/testfile2
+EOF
+`
+if [ -n "${DIFF}" ]
+then
+	echo "Test failed: file listing invalid, diff follows:"
+	echo "${DIFF}"
+	exit
+fi
+
 # It should come up as available...
 RESOLVE=`pkcon resolve --filter "~installed" testpkg | grep "Available.*"`
 if [ -n "${RESOLVE}" ]