Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4ebd1e3
Whitespace cleanup
Baptiste Daroussin committed 11 years ago
commit 4ebd1e37b46d2c1342dbca69eabdc209e1e03556
parent 5ff61b6
13 files changed +270 -297
modified tests/frontend/add.shin
@@ -264,7 +264,7 @@ post-install
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case add

	atf_add_test_case add_automatic
modified tests/frontend/annotate.shin
@@ -128,7 +128,7 @@ annotate_body() {
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	# Tests are run in alphabetical order

	atf_add_test_case annotate
modified tests/frontend/conflicts.shin
@@ -95,5 +95,6 @@ ${JAILED}[2/2] Extracting test2-1... done


atf_init_test_cases() {

	. $(atf_get_srcdir)/test_environment.sh
+ 


	atf_add_test_case find_conflicts

}
modified tests/frontend/create.shin
@@ -355,7 +355,7 @@ EOF
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case create_from_plist

	atf_add_test_case create_from_plist_set_owner
modified tests/frontend/delete.shin
@@ -169,7 +169,7 @@ EOF
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case simple_delete

	atf_add_test_case simple_delete_prefix_ending_with_slash
modified tests/frontend/lock.shin
@@ -9,85 +9,81 @@ lock_head() {


lock_body() {

	for pkg in 'png' 'sqlite3' ; do
- 
	    atf_check \
- 
		-o match:".*Installing.*\.\.\.$" \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg register -t -M $(atf_get_srcdir)/$pkg.ucl
+ 
		atf_check \
+ 
		    -o match:".*Installing.*\.\.\.$" \
+ 
		    -e empty \
+ 
		    -s exit:0 \
+ 
		    pkg register -t -M $(atf_get_srcdir)/$pkg.ucl

	done
- 
	[ -f "./local.sqlite" ] || \
+ 
	test -f "./local.sqlite" || \

	    atf_fail "Can't populate $PKG_DBDIR/local.sqlite"



	atf_check \
- 
		-o match:"Locking sqlite3.*" \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg lock -y sqlite3
+ 
	    -o match:"Locking sqlite3.*" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg lock -y sqlite3



	atf_check \
- 
		-o match:"sqlite3-3.8.6" \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg lock -l
+ 
	    -o match:"sqlite3-3.8.6" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg lock -l



	atf_check \
- 
                -o inline:"sqlite3-3.8.6: already locked\n" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg lock -y sqlite3
-
+ 
	    -o inline:"sqlite3-3.8.6: already locked\n" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg lock -y sqlite3



	atf_check \
- 
                -o match:"Unlocking sqlite3.*" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg unlock -y sqlite3
+ 
	    -o match:"Unlocking sqlite3.*" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg unlock -y sqlite3



	atf_check \
- 
                -o inline:"Currently locked packages:\n" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg lock -l
+ 
	    -o inline:"Currently locked packages:\n" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg lock -l



	atf_check \
- 
                -o inline:"sqlite3-3.8.6: already unlocked\n" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg unlock -y sqlite3
+ 
	    -o inline:"sqlite3-3.8.6: already unlocked\n" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg unlock -y sqlite3



	atf_check \
- 
                -o match:"Locking.*" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg lock -y -a
+ 
	    -o match:"Locking.*" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg lock -y -a



	atf_check \
- 
                -o match:"sqlite3.*" \
- 
		-o match:"png.*" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg lock -l
-
- 
       atf_check \
- 
                -o match:"Unlocking.*" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg unlock -y -a
-
- 
        atf_check \
- 
                -o inline:"Currently locked packages:\n" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg lock -l
+ 
	    -o match:"sqlite3.*" \
+ 
	    -o match:"png.*" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg lock -l
+ 
	atf_check \
+ 
	    -o match:"Unlocking.*" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg unlock -y -a
+ 
	atf_check \
+ 
	    -o inline:"Currently locked packages:\n" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg lock -l

}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	# Tests are run in alphabetical order

	atf_add_test_case lock
- 


}
modified tests/frontend/packagesplit.shin
@@ -9,7 +9,7 @@ package_split_body() {
	touch file1

	touch file2
- 
	cat << EOF >> pkg1.ucl
+ 
	cat << EOF > pkg1.ucl

name: test

origin: test

version: 1
@@ -22,12 +22,12 @@ desc: <<EOD
Yet another test

EOD

files: {
- 
    ${TMPDIR}/file1: "",
- 
    ${TMPDIR}/file2: "",
+ 
	${TMPDIR}/file1: "",
+ 
	${TMPDIR}/file2: "",

}

EOF
- 
	cat << EOF >> dep1.ucl
+ 
	cat << EOF > dep1.ucl

name: master

origin: test

version: 1
@@ -47,7 +47,7 @@ deps: {
}

EOF
- 
cat << EOF >> pkg2.ucl
+ 
cat << EOF > pkg2.ucl

name: sub-test

origin: test

version: 1
@@ -64,7 +64,7 @@ files: {
}

EOF
- 
cat << EOF >> pkg3.ucl
+ 
cat << EOF > pkg3.ucl

name: sub-test2

origin: test

version: 1
@@ -81,7 +81,7 @@ files: {
}

EOF
- 
	cat << EOF >> pkg4.ucl
+ 
	cat << EOF > pkg4.ucl

name: test

origin: test

version: 1
@@ -104,46 +104,46 @@ deps: {
	}

}

EOF
-
+ 


	for p in pkg1 dep1; do

		atf_check \
- 
			-o match:".*Installing.*\.\.\.$" \
- 
			-e empty \
- 
			-s exit:0 \
- 
			pkg register -M ${p}.ucl
+ 
		    -o match:".*Installing.*\.\.\.$" \
+ 
		    -e empty \
+ 
		    -s exit:0 \
+ 
		    pkg register -M ${p}.ucl

	done



	for p in dep1 pkg2 pkg3 pkg4; do

		atf_check \
- 
			-o ignore \
- 
			-e empty \
- 
			-s exit:0 \
- 
			pkg create -M ./${p}.ucl
+ 
		    -o ignore \
+ 
		    -e empty \
+ 
		    -s exit:0 \
+ 
		    pkg create -M ./${p}.ucl

	done



	atf_check \
- 
		-o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg repo .
+ 
	    -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg repo .
- 
	cat << EOF >> repo.conf
+ 
	cat << EOF > repo.conf

local: {

	url: file:///$TMPDIR,

	enabled: true

}

EOF

	atf_check \
- 
		-o ignore \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
+ 
	    -o ignore \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y



	test -f file1 || atf_fail "file1 is not present"

}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case package_split

}
modified tests/frontend/pkg.shin
@@ -6,11 +6,11 @@ pkg_no_database_head() {
}



pkg_no_database_body() {
- 
    atf_check \
- 
	-o empty \
- 
	-e inline:"pkg: package database non-existent\n" \
- 
	-s exit:69 \
- 
	-x PKG_DBDIR=/dev/null pkg -N
+ 
	atf_check \
+ 
	    -o empty \
+ 
	    -e inline:"pkg: package database non-existent\n" \
+ 
	    -s exit:69 \
+ 
	    -x PKG_DBDIR=/dev/null pkg -N

}



atf_test_case pkg_config_defaults
@@ -21,33 +21,33 @@ pkg_config_defaults_head()


pkg_config_defaults_body()

{
- 
    atf_check                 \
- 
	-o match:'^ *PKG_DBDIR = "/var/db/pkg";$' \
- 
	-o match:'^ *PKG_CACHEDIR = "/var/cache/pkg";$' \
- 
	-o match:'^ *PORTSDIR = "/usr/ports";$' \
- 
	-o match:'^ *HANDLE_RC_SCRIPTS = false;$' \
- 
	-o match:'^ *DEFAULT_ALWAYS_YES = false;$' \
- 
	-o match:'^ *ASSUME_ALWAYS_YES = false;$' \
- 
	-o match:'^ *PLIST_KEYWORDS_DIR = "";$' \
- 
	-o match:'^ *SYSLOG = true;$' \
- 
	-o match:'^ *ALTABI = "[a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9:]+";$' \
- 
	-o match:'^ *DEVELOPER_MODE = false;$' \
- 
	-o match:'^ *VULNXML_SITE = "http://vuxml.freebsd.org/freebsd/vuln.xml.bz2";$' \
- 
	-o match:'^ *FETCH_RETRY = 3;$' \
- 
	-o match:'^ *PKG_PLUGINS_DIR = ".*lib/pkg/";$' \
- 
	-o match:'^ *PKG_ENABLE_PLUGINS = true;$' \
- 
	-o match:'^ *DEBUG_SCRIPTS = false;$' \
- 
	-o match:'^ *PLUGINS_CONF_DIR = ".*/etc/pkg/";$' \
- 
	-o match:'^ *PERMISSIVE = false;$' \
- 
	-o match:'^ *REPO_AUTOUPDATE = true;$' \
- 
	-o match:'^ *NAMESERVER = "";$' \
- 
	-o match:'^ *EVENT_PIPE = "";$' \
- 
	-o match:'^ *FETCH_TIMEOUT = 30;$' \
- 
	-o match:'^ *UNSET_TIMESTAMP = false;$' \
- 
	-o match:'^ *SSH_RESTRICT_DIR = "";$' \
- 
	-e empty              \
- 
	-s exit:0             \
- 
	env -i PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" pkg -C "" -R "" -vv
+ 
	atf_check \
+ 
	    -o match:'^ *PKG_DBDIR = "/var/db/pkg";$' \
+ 
	    -o match:'^ *PKG_CACHEDIR = "/var/cache/pkg";$' \
+ 
	    -o match:'^ *PORTSDIR = "/usr/d?ports";$' \
+ 
	    -o match:'^ *HANDLE_RC_SCRIPTS = false;$' \
+ 
	    -o match:'^ *DEFAULT_ALWAYS_YES = false;$' \
+ 
	    -o match:'^ *ASSUME_ALWAYS_YES = false;$' \
+ 
	    -o match:'^ *PLIST_KEYWORDS_DIR = "";$' \
+ 
	    -o match:'^ *SYSLOG = true;$' \
+ 
	    -o match:'^ *ALTABI = "[a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9:]+";$' \
+ 
	    -o match:'^ *DEVELOPER_MODE = false;$' \
+ 
	    -o match:'^ *VULNXML_SITE = "http://vuxml.freebsd.org/freebsd/vuln.xml.bz2";$' \
+ 
	    -o match:'^ *FETCH_RETRY = 3;$' \
+ 
	    -o match:'^ *PKG_PLUGINS_DIR = ".*lib/pkg/";$' \
+ 
	    -o match:'^ *PKG_ENABLE_PLUGINS = true;$' \
+ 
	    -o match:'^ *DEBUG_SCRIPTS = false;$' \
+ 
	    -o match:'^ *PLUGINS_CONF_DIR = ".*/etc/pkg/";$' \
+ 
	    -o match:'^ *PERMISSIVE = false;$' \
+ 
	    -o match:'^ *REPO_AUTOUPDATE = true;$' \
+ 
	    -o match:'^ *NAMESERVER = "";$' \
+ 
	    -o match:'^ *EVENT_PIPE = "";$' \
+ 
	    -o match:'^ *FETCH_TIMEOUT = 30;$' \
+ 
	    -o match:'^ *UNSET_TIMESTAMP = false;$' \
+ 
	    -o match:'^ *SSH_RESTRICT_DIR = "";$' \
+ 
	    -e empty              \
+ 
	    -s exit:0             \
+ 
	    env -i PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" pkg -C "" -R "" -vv

}



atf_test_case pkg_create_manifest_bad_syntax
@@ -76,13 +76,15 @@ files:
  /usr/local/include/someFile.hp: 'sha256sum' p

EOF

	atf_check \
- 
		-o empty \
- 
		-e inline:"pkg: Skipping malformed key 'files'\n" \
- 
		-s exit:0 pkg create -q -m testpkg/.metadir -r testpkg
+ 
	    -o empty \
+ 
	    -e inline:"pkg: Skipping malformed key 'files'\n" \
+ 
	    -s exit:0 \
+ 
	    pkg create -q -m testpkg/.metadir -r testpkg

	atf_check \
- 
		-o empty \
- 
		-e empty \
- 
		-s exit:1 test -f test-1.txz
+ 
	    -o empty \
+ 
	    -e empty \
+ 
	    -s exit:1 \
+ 
	    test -f test-1.txz

}



atf_test_case pkg_repo_load_order
@@ -99,14 +101,14 @@ pkg_repo_load_order_body()


	out=$(pkg -o REPOS_DIR=. -vv | tail -16)

	atf_check \
- 
		-o match:'.*01_repo\:.*02_repo\:.*03_repo\:.*' \
- 
		-e empty \
- 
		-s exit:0 \
- 
		echo $out
+ 
	    -o match:'.*01_repo\:.*02_repo\:.*03_repo\:.*' \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    echo $out

}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case pkg_no_database

	atf_add_test_case pkg_config_defaults
modified tests/frontend/register.shin
@@ -27,8 +27,7 @@ EOF
	    -o match:".*Installing.*" \

	    -e empty \

	    -s exit:0 \
- 
	    pkg register --relocate . -i teststage \
- 
	    -M test.ucl
+ 
	    pkg register --relocate . -i teststage -M test.ucl

	nsum=$(openssl dgst -sha256 -binary plop | hexdump -v -e '/1 "%x"')

	atf_check_equal ${sum} ${nsum}

	rm -f test.ucl
@@ -51,13 +50,13 @@ EOF
	    -o match:".*Installing.*" \

	    -e match:".*conflicts.*" \

	    -s exit:70 \
- 
	    pkg register --relocate . -i teststage \
- 
	    -M test.ucl
+ 
	    pkg register --relocate . -i teststage -M test.ucl

	nsum=$(openssl dgst -sha256 -binary plop | hexdump -v -e '/1 "%x"')

	atf_check_equal ${sum} ${nsum}

}



atf_init_test_cases() {

	. $(atf_get_srcdir)/test_environment.sh
+ 


	atf_add_test_case register_conflicts

}
modified tests/frontend/requires.shin
@@ -44,17 +44,17 @@ requires: [a]
EOF

	for p in a b; do

		atf_check \
- 
			-o ignore \
- 
			-e empty \
- 
			-s exit:0 \
- 
			pkg create -M ./${p}.ucl
+ 
		    -o ignore \
+ 
		    -e empty \
+ 
		    -s exit:0 \
+ 
		    pkg create -M ./${p}.ucl

	done



	atf_check \
- 
		-o ignore \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg repo .
+ 
	    -o ignore \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg repo .



OUTPUT="Updating local1 repository catalogue...

${JAILED}Fetching meta.txz... done
@@ -70,14 +70,14 @@ New packages to be INSTALLED:
"



	atf_check \
- 
		-o inline:"${OUTPUT}" \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg -o REPOS_DIR="${TMPDIR}" install -n b
+ 
	    -o inline:"${OUTPUT}" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg -o REPOS_DIR="${TMPDIR}" install -n b

}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case requires

}
modified tests/frontend/rubypuppet.shin
@@ -17,9 +17,7 @@ pkg_puppet_body() {
	touch rubygemhiera.file

	touch rubygems.file
-
-
- 
        cat << EOF >> rubygemrubyaugeas.ucl
+ 
	cat << EOF > rubygemrubyaugeas.ucl

name: rubygem-ruby-augeas

origin: textproc/rubygem-augeas

version: "1.0"
@@ -32,26 +30,21 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby: {
- 
                origin: "lang/ruby20",
- 
                version: "2.0"
- 
        },
- 
    	ruby20-gems: {
- 
                origin: "lang/ruby-gems",
- 
                version: "1.0"
- 
        }
-
+ 
	ruby: {
+ 
		origin: "lang/ruby20",
+ 
		version: "2.0"
+ 
	},
+ 
	ruby20-gems: {
+ 
		origin: "lang/ruby-gems",
+ 
		version: "1.0"
+ 
	}

}
- 


files: {
- 
    ${TMPDIR}/rubygemrubyaugeas.file: "",
+ 
	${TMPDIR}/rubygemrubyaugeas.file: "",

}

EOF
-
-
-
- 
	cat << EOF >> puppet.ucl
+ 
	cat << EOF > puppet.ucl

name: puppet

origin: sysutils/puppet

version: "1.0"
@@ -64,27 +57,25 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby: {
- 
                origin: "lang/ruby20",
- 
                version: "2.0"
- 
        },
- 
	 rubygem-hiera: {
- 
                origin: "lang/rubygem-hiera",
- 
                version: "1.0"
- 
        },
+ 
	ruby: {
+ 
		origin: "lang/ruby20",
+ 
		version: "2.0"
+ 
	},
+ 
	rubygem-hiera: {
+ 
		origin: "lang/rubygem-hiera",
+ 
		version: "1.0"
+ 
	},

	rubygem-ruby-augeas: {

		origin: "textproc/rubygem-augeas",

		version: "1.0"

	}
- 


}
- 


files: {
- 
    ${TMPDIR}/puppet.file: "",
+ 
	${TMPDIR}/puppet.file: "",

}

EOF
- 
	cat << EOF >> ruby.ucl
+ 
	cat << EOF > ruby.ucl

name: ruby

origin: lang/ruby20

version: "2.0"
@@ -97,14 +88,14 @@ desc: <<EOD
Yet another test

EOD

shlibs_provided [
- 
    "libruby20.so.20",
+ 
	"libruby20.so.20",

]

files: {
- 
    ${TMPDIR}/ruby.file: "",
+ 
	${TMPDIR}/ruby.file: "",

}

EOF
- 
        cat << EOF >> rubygem-hiera.ucl
+ 
	cat << EOF > rubygem-hiera.ucl

name: rubygem-hiera

origin: lang/rubygem-hiera

version: "1.0"
@@ -117,21 +108,21 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby: {
- 
                origin: "lang/ruby20",
- 
                version: "2.0"
- 
        },
+ 
	ruby: {
+ 
		origin: "lang/ruby20",
+ 
		version: "2.0"
+ 
	},

	ruby20-gems: {

		origin: "lang/ruby-gems",

		version: "1.0"

	},

}

files: {
- 
    ${TMPDIR}/rubygemhiera.file: "",
+ 
	${TMPDIR}/rubygemhiera.file: "",

}

EOF
- 
        cat << EOF >> ruby-gems20.ucl
+ 
	cat << EOF > ruby-gems20.ucl

name: ruby20-gems

origin: lang/ruby-gems

version: "1.0"
@@ -144,54 +135,49 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby {
- 
                origin: lang/ruby20,
- 
                version: "2.0"
- 
        }
+ 
	ruby {
+ 
		origin: lang/ruby20,
+ 
		version: "2.0"
+ 
	}

}

files: {
- 
    ${TMPDIR}/rubygems.file: "",
+ 
	${TMPDIR}/rubygems.file: "",

}

EOF
- 
        cat << EOF >> repo1.conf
+ 
	cat << EOF > repo1.conf

local1: {
- 
        url: file://${TMPDIR},
- 
        enabled: true
+ 
	url: file://${TMPDIR},
+ 
	enabled: true

}

EOF
- 
for p in ruby ruby-gems20 rubygem-hiera rubygemrubyaugeas puppet; do
- 
                atf_check \
- 
                        -o ignore \
- 
                        -e empty \
- 
                        -s exit:0 \
- 
                        pkg create -M ./${p}.ucl
- 
        done
-
- 
 atf_check \
- 
                -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg repo .
-
-
- 
  atf_check \
- 
                -o ignore \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y puppet
-
+ 
	for p in ruby ruby-gems20 rubygem-hiera rubygemrubyaugeas puppet; do
+ 
		atf_check \
+ 
		    -o ignore \
+ 
		    -e empty \
+ 
		    -s exit:0 \
+ 
		    pkg create -M ./${p}.ucl
+ 
	done
+
+ 
	atf_check \
+ 
	    -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg repo .
+
+ 
	atf_check \
+ 
	    -o ignore \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y puppet



#### NEW
- 


	rm repo1.conf

	rm -f *.ucl

	rm *.txz
- 
	#cp /root/local.sqlit ${TMPDIR}/
-
- 
        cat << EOF >> rubygemrubyaugeas.new.ucl
+ 
	cat << EOF > rubygemrubyaugeas.new.ucl

name: rubygem-ruby-augeas

origin: textproc/rubygem-augeas

version: "1.0"
@@ -204,25 +190,21 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby: {
- 
                origin: "lang/ruby21",
- 
                version: "2.1"
- 
        },
- 
        ruby21-gems: {
- 
                origin: "lang/ruby-gems",
- 
                version: "1.0"
- 
        }
-
+ 
	ruby: {
+ 
		origin: "lang/ruby21",
+ 
		version: "2.1"
+ 
	},
+ 
	ruby21-gems: {
+ 
		origin: "lang/ruby-gems",
+ 
		version: "1.0"
+ 
	}

}
- 


files: {
- 
    ${TMPDIR}/rubygemrubyaugeas.file: "",
+ 
	${TMPDIR}/rubygemrubyaugeas.file: "",

}

EOF
-
-
- 
        cat << EOF >> puppet.new.ucl
+ 
	cat << EOF > puppet.new.ucl

name: puppet

origin: sysutils/puppet

version: "1.0"
@@ -235,29 +217,25 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby: {
- 
                origin: "lang/ruby21",
- 
                version: "2.1"
- 
        },
- 
   	rubygem-hiera: {
- 
                origin: "lang/rubygem-hiera",
- 
                version: "1.0"
- 
        },
- 
    	rubygem-ruby-augeas: {
- 
                origin: "textproc/rubygem-augeas",
- 
                version: "1.0"
- 
        }
-
-
+ 
	ruby: {
+ 
		origin: "lang/ruby21",
+ 
		version: "2.1"
+ 
	},
+ 
	rubygem-hiera: {
+ 
		origin: "lang/rubygem-hiera",
+ 
		version: "1.0"
+ 
	},
+ 
	rubygem-ruby-augeas: {
+ 
		origin: "textproc/rubygem-augeas",
+ 
		version: "1.0"
+ 
	}

}
- 


files: {
- 
    ${TMPDIR}/puppet.file: "",
+ 
	${TMPDIR}/puppet.file: "",

}

EOF
-
- 
        cat << EOF >> ruby.new.ucl
+ 
cat << EOF > ruby.new.ucl

name: ruby

origin: lang/ruby21

version: "2.1"
@@ -270,14 +248,14 @@ desc: <<EOD
Yet another test

EOD

shlibs_provided [
- 
    "libruby21.so.21",
+ 
	"libruby21.so.21",

]

files: {
- 
    ${TMPDIR}/ruby.file: "",
+ 
	${TMPDIR}/ruby.file: "",

}

EOF
- 
        cat << EOF >> rubygem-hiera.new.ucl
+ 
cat << EOF > rubygem-hiera.new.ucl

name: rubygem-hiera

origin: lang/rubygem-hiera

version: "1.0"
@@ -290,21 +268,21 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby: {
- 
                origin: "lang/ruby21",
- 
                version: "2.1"
- 
        },
- 
        ruby21-gems: {
- 
                origin: "lang/ruby-gems",
- 
                version: "1.0"
- 
        },
+ 
	ruby: {
+ 
		origin: "lang/ruby21",
+ 
		version: "2.1"
+ 
	},
+ 
	ruby21-gems: {
+ 
		origin: "lang/ruby-gems",
+ 
		version: "1.0"
+ 
	},

}

files: {
- 
    ${TMPDIR}/rubygemhiera.file: "",
- 
}
+ 
	${TMPDIR}/rubygemhiera.file: "",
+ 
	}

EOF
- 
        cat << EOF >> ruby-gems21.new.ucl
+ 
cat << EOF > ruby-gems21.new.ucl

name: ruby21-gems

origin: lang/ruby-gems

version: "1.0"
@@ -317,40 +295,38 @@ desc: <<EOD
Yet another test

EOD

deps: {
- 
        ruby {
- 
                origin: lang/ruby21,
- 
                version: "2.1"
- 
        }
+ 
	ruby {
+ 
		origin: lang/ruby21,
+ 
		version: "2.1"
+ 
	}

}

files: {
- 
    ${TMPDIR}/rubygems.file: "",
+ 
	${TMPDIR}/rubygems.file: "",

}

EOF
-
- 
for p in ruby ruby-gems21 rubygem-hiera rubygemrubyaugeas puppet; do
- 
                atf_check \
- 
                        -o ignore \
- 
                        -e empty \
- 
                        -s exit:0 \
- 
                        pkg create -M ./${p}.new.ucl
- 
        done
-
-
- 
   atf_check \
- 
                -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg repo .
-
- 
        cat << EOF >> repo.conf
+ 
	for p in ruby ruby-gems21 rubygem-hiera rubygemrubyaugeas puppet; do
+ 
		atf_check \
+ 
		    -o ignore \
+ 
		    -e empty \
+ 
		    -s exit:0 \
+ 
		    pkg create -M ./${p}.new.ucl
+ 
	done
+
+ 
	atf_check \
+ 
	    -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg repo .
+
+ 
	cat << EOF > repo.conf

local: {
- 
        url: file://${TMPDIR}/,
- 
        enabled: true
+ 
	url: file://${TMPDIR}/,
+ 
	enabled: true

}

EOF
- 
OUTPUT="Updating local repository catalogue...
+ 
	OUTPUT="Updating local repository catalogue...

${JAILED}Fetching meta.txz... done

${JAILED}Fetching packagesite.txz... done

Processing entries... done
@@ -375,19 +351,16 @@ Installed packages to be REINSTALLED:
	rubygem-hiera-1.0 (direct dependency changed: ruby)

	puppet-1.0 (direct dependency changed: ruby)

"
-
-
- 
 atf_check \
- 
                -o inline:"${OUTPUT}" \
- 
                -e empty \
- 
                -s exit:0 \
- 
                pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -yn
-
+ 
	atf_check \
+ 
	    -o inline:"${OUTPUT}" \
+ 
	    -e empty \
+ 
	    -s exit:0 \
+ 
	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -yn

}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case pkg_puppet

}
modified tests/frontend/search.shin
@@ -11,6 +11,7 @@ search_body() {
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment.sh
+ 
	. $(atf_get_srcdir)/test_environment.sh
+ 


	atf_add_test_case search

}
modified tests/frontend/version.shin
@@ -14,5 +14,6 @@ version_body() {


atf_init_test_cases() {

	. $(atf_get_srcdir)/test_environment.sh
+ 


	atf_add_test_case version

}