bulk tests: Use explicit EXPECTED_QUEUED lists

43 files changed, 126 insertions, 128 deletions

diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index d9356641..34716b1a 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -1422,9 +1422,6 @@ show_log_info() {
 
 show_dry_run_summary() {
 	[ ${DRY_RUN} -eq 1 ] || return 0
-	local log
-
-	_log_path log
 
 	bset status "done:"
 	msg "Dry run mode, cleaning up and exiting"
@@ -1437,16 +1434,7 @@ show_dry_run_summary() {
 
 		if [ "${ALL}" -eq 0 ] || [ "${VERBOSE}" -ge 1 ]; then
 			msg_n "Ports to build: "
-			{
-				if was_a_testport_run; then
-					echo "${ORIGINSPEC}"
-				fi
-				cat "${log}/.poudriere.ports.queued"
-			} | while mapfile_read_loop_redir originspec pkgname \
-			    _ignored; do
-				pkgqueue_contains "${pkgname}" || continue
-				echo "${originspec}"
-			done | sort | tr '\n' ' '
+			get_to_build | paste -s -d ' ' -
 			echo
 		fi
 	else
@@ -7929,6 +7917,7 @@ prepare_ports() {
 		fi
 
 		load_priorities
+		get_to_build > "${log}/.poudriere.ports.tobuild"
 
 		# Avoid messing with the queue for DRY_RUN or it confuses
 		# the dry run summary output as it doesn't know about
@@ -7955,12 +7944,26 @@ prepare_ports() {
 		jget ${JAILNAME} version > "${PACKAGES}/.jailversion" || \
 		    err 1 "Missing version metadata for jail"
 		echo "${BUILDNAME}" > "${PACKAGES}/.buildname"
-
 	fi
 
 	return 0
 }
 
+get_to_build() {
+	local log
+
+	_log_path log
+	{
+		if was_a_testport_run; then
+			echo "${ORIGINSPEC}"
+		fi
+		cat "${log}/.poudriere.ports.queued"
+	} | while mapfile_read_loop_redir originspec pkgname _ignored; do
+		pkgqueue_contains "${pkgname}" || continue
+		echo "${originspec}"
+	done | sort
+}
+
 load_priorities_ptsort() {
 	local priority pkgname originspec pkg_boost origin flavor _ignored
 	local - # Keep set -f local
diff --git a/test/bulk-build-self-immutable-base-nullfs.sh b/test/bulk-build-self-immutable-base-nullfs.sh
index 1bfafc62..82f38f54 100644
--- a/test/bulk-build-self-immutable-base-nullfs.sh
+++ b/test/bulk-build-self-immutable-base-nullfs.sh
@@ -6,5 +6,8 @@ IMMUTABLE_BASE=nullfs
 do_bulk -c ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="ports-mgmt/pkg misc/freebsd-release-manifests ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel"
+
 assert_bulk_queue_and_stats
 assert_bulk_build_results
diff --git a/test/bulk-build-self-immutable-base-schg.sh b/test/bulk-build-self-immutable-base-schg.sh
index 6f5915b0..0e3d1d4d 100644
--- a/test/bulk-build-self-immutable-base-schg.sh
+++ b/test/bulk-build-self-immutable-base-schg.sh
@@ -6,5 +6,8 @@ IMMUTABLE_BASE=schg
 do_bulk -c ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="ports-mgmt/pkg misc/freebsd-release-manifests ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel"
+
 assert_bulk_queue_and_stats
 assert_bulk_build_results
diff --git a/test/bulk-build-self-immutable-base-yes.sh b/test/bulk-build-self-immutable-base-yes.sh
index 2a9eea82..802b4f34 100644
--- a/test/bulk-build-self-immutable-base-yes.sh
+++ b/test/bulk-build-self-immutable-base-yes.sh
@@ -6,5 +6,8 @@ IMMUTABLE_BASE=yes
 do_bulk -c ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="ports-mgmt/pkg misc/freebsd-release-manifests ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel"
+
 assert_bulk_queue_and_stats
 assert_bulk_build_results
diff --git a/test/bulk-flavor-FLAVORS-misordered.sh b/test/bulk-flavor-FLAVORS-misordered.sh
index 8a1cd863..67b43c1a 100644
--- a/test/bulk-flavor-FLAVORS-misordered.sh
+++ b/test/bulk-flavor-FLAVORS-misordered.sh
@@ -9,5 +9,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED"
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@FLAV misc/foo-dep-FLAVORS-unsorted misc/foo-dep-FLAVORS-unsorted@FLAV ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-FLAVORS-unsorted@FLAV misc/foo-FLAVORS-unsorted@IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-default-dep-and-specific-listed.sh b/test/bulk-flavor-default-dep-and-specific-listed.sh
index 849be7a2..dc00d9c0 100644
--- a/test/bulk-flavor-default-dep-and-specific-listed.sh
+++ b/test/bulk-flavor-default-dep-and-specific-listed.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="misc/freebsd-release-manifests@FOO ports-mgmt/poudriere-devel"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-default-dep.sh b/test/bulk-flavor-default-dep.sh
index 59ca671e..fae2b60d 100644
--- a/test/bulk-flavor-default-dep.sh
+++ b/test/bulk-flavor-default-dep.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-all.sh b/test/bulk-flavor-ignore-all.sh
index 9d834d47..28b6b169 100644
--- a/test/bulk-flavor-ignore-all.sh
+++ b/test/bulk-flavor-ignore-all.sh
@@ -7,5 +7,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@IGNORED ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped misc/foop-IGNORED misc/foo-all-IGNORED@DEFAULT misc/foo-all-IGNORED@FLAV misc/foo-default-IGNORED@DEFAULT misc/foo-all-DEPIGNORED@FLAV"
 EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED misc/foo-all-DEPIGNORED@DEFAULT misc/foo-default-DEPIGNORED@DEFAULT"
+EXPECTED_QUEUED="converters/libiconv devel/ccache devel/gettext devel/gettext-runtime devel/gettext-tools devel/libffi devel/libtextstyle devel/pkgconf devel/readline lang/perl5.30 lang/python lang/python2 lang/python27 lang/python3 lang/python37 misc/foo misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@FLAV misc/foo-default-DEPIGNORED@FLAV misc/foo-default-IGNORED@FLAV misc/foo-dep-FLAVORS-unsorted misc/foo-dep-FLAVORS-unsorted@FLAV misc/foo@FLAV misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-dep-DEFAULT ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/yyyy ports-mgmt/zzzz print/indexinfo security/openssl"
+EXPECTED_LISTED="converters/libiconv devel/ccache devel/gettext devel/gettext-runtime devel/gettext-tools devel/libffi devel/libtextstyle devel/pkgconf devel/readline lang/perl5.30 lang/python lang/python2 lang/python27 lang/python3 lang/python37 misc/foo misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-FLAVORS-unsorted@FLAV misc/foo-FLAVORS-unsorted@IGNORED misc/foo-all-DEPIGNORED misc/foo-all-DEPIGNORED@FLAV misc/foo-all-IGNORED misc/foo-all-IGNORED@FLAV misc/foo-default-DEPIGNORED misc/foo-default-DEPIGNORED@FLAV misc/foo-default-IGNORED misc/foo-default-IGNORED@FLAV misc/foo-dep-FLAVORS-unsorted misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@FLAV misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@FLAV misc/foo@IGNORED misc/foop-IGNORED misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped ports-mgmt/poudriere-devel-dep-DEFAULT ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED ports-mgmt/yyyy ports-mgmt/zzzz print/indexinfo security/openssl"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh
index fee04cc7..9fbdb437 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh
@@ -2,10 +2,6 @@ FLAVOR_DEFAULT_ALL=no
 FLAVOR_DEFAULT=-
 
 LISTPORTS="misc/foo-all-DEPIGNORED@FLAV"
-# XXX: Adding this is because the framework gets very confused otherwise.
-# That is, why are we actually queueing the skipped listed port? It's
-# skipped early.
-LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
 OVERLAYS="overlay omnibus"
 . common.bulk.sh
 
@@ -14,5 +10,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED="misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
 EXPECTED_SKIPPED="misc/foo-all-DEPIGNORED@FLAV"
+EXPECTED_QUEUED="ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-all-DEPIGNORED@FLAV"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-all-depignored.sh b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored.sh
index 2017e02e..acd8362d 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-all-depignored.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored.sh
@@ -2,10 +2,6 @@ FLAVOR_DEFAULT_ALL=no
 
 # XXX: Removing DEFAULT here breaks the framework. It should default to the first flav due to FLAVOR_DEFAULT_ALL=no
 LISTPORTS="misc/foo-all-DEPIGNORED@DEFAULT"
-# XXX: Adding this is because the framework gets very confused otherwise.
-# That is, why are we actually queueing the skipped listed port? It's
-# skipped early.
-LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
 OVERLAYS="overlay omnibus"
 . common.bulk.sh
 
@@ -14,5 +10,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED="misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
 EXPECTED_SKIPPED="misc/foo-all-DEPIGNORED@DEFAULT"
+EXPECTED_QUEUED="ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-all-DEPIGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-all.sh b/test/bulk-flavor-ignore-vs-skip-listed-all.sh
index 173075fc..efc28efa 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-all.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-all.sh
@@ -12,5 +12,7 @@ assert 0 $? "Bulk should pass"
 # Everything should just be ignored.
 EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@FLAV misc/foo-dep-FLAVORS-unsorted misc/foo-dep-FLAVORS-unsorted@FLAV ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-FLAVORS-unsorted@FLAV misc/foo-FLAVORS-unsorted@IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-all.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-all.sh
index fcbf72d2..dadc3982 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-default-all.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-all.sh
@@ -11,5 +11,7 @@ assert 0 $? "Bulk should pass"
 # Everything should just be ignored.
 EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/foo-FLAVORS-unsorted@- misc/foo-FLAVORS-unsorted@FLAV misc/foo-dep-FLAVORS-unsorted@- misc/foo-dep-FLAVORS-unsorted@FLAV ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-FLAVORS-unsorted@FLAV misc/foo-FLAVORS-unsorted@IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh
index a67d0c1e..be3d92a5 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh
@@ -10,5 +10,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED=
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/foo-default-DEPIGNORED@FLAV ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-default-DEPIGNORED@FLAV"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-depignored.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored.sh
index 38f5e560..889406c0 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-default-depignored.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored.sh
@@ -2,10 +2,6 @@ FLAVOR_DEFAULT_ALL=no
 
 # XXX: Removing DEFAULT here breaks the framework. It should default to the first flav due to FLAVOR_DEFAULT_ALL=no
 LISTPORTS="misc/foo-default-DEPIGNORED@DEFAULT"
-# XXX: Adding this is because the framework gets very confused otherwise.
-# That is, why are we actually queueing the skipped listed port? It's
-# skipped early.
-LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
 OVERLAYS="overlay omnibus"
 . common.bulk.sh
 
@@ -14,5 +10,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED="misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
 EXPECTED_SKIPPED="misc/foo-default-DEPIGNORED@DEFAULT"
+EXPECTED_QUEUED="ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-default-DEPIGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh
index d970ef0c..a8a2f97a 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh
@@ -10,5 +10,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED=
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/foo-default-IGNORED@FLAV ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-default-IGNORED@FLAV"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-ignored.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored.sh
index 803953fe..70057b1f 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-default-ignored.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored.sh
@@ -1,18 +1,15 @@
 FLAVOR_DEFAULT_ALL=no
 
 LISTPORTS="misc/foo-default-IGNORED@DEFAULT"
-# XXX: Adding this is because the framework gets very confused otherwise.
-# That is, why are we actually queueing the skipped listed port? It's
-# skipped early.
-LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
 OVERLAYS="overlay omnibus"
 . common.bulk.sh
 
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
-EXPECTED_LISTPORTS_IGNORED="misc/foo-default-IGNORED@DEFAULT"
 EXPECTED_IGNORED="misc/foo-default-IGNORED@DEFAULT"
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED=
+EXPECTED_LISTED="misc/foo-default-IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default.sh b/test/bulk-flavor-ignore-vs-skip-listed-default.sh
index c05c911d..9518d03a 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-default.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default.sh
@@ -10,5 +10,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED=
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/foo-FLAVORS-unsorted misc/foo-dep-FLAVORS-unsorted ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-FLAVORS-unsorted"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-flavor-ignored.sh b/test/bulk-flavor-ignore-vs-skip-listed-flavor-ignored.sh
index c070120b..901d3364 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-flavor-ignored.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-flavor-ignored.sh
@@ -8,8 +8,9 @@ do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
 # Nothing fancy.
-EXPECTED_LISTPORTS_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED"
 EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED"
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED=""
+EXPECTED_LISTED="misc/foo-FLAVORS-unsorted@IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-flavor.sh b/test/bulk-flavor-ignore-vs-skip-listed-flavor.sh
index 65be1f3e..bd7d5b8b 100644
--- a/test/bulk-flavor-ignore-vs-skip-listed-flavor.sh
+++ b/test/bulk-flavor-ignore-vs-skip-listed-flavor.sh
@@ -1,10 +1,6 @@
 FLAVOR_DEFAULT_ALL=no
 
 LISTPORTS="misc/foo-FLAVORS-unsorted@DEPIGNORED"
-# XXX: Adding this is because the framework gets very confused otherwise.
-# That is, why are we actually queueing the skipped listed port? It's
-# skipped early.
-LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
 OVERLAYS="overlay omnibus"
 . common.bulk.sh
 
@@ -16,5 +12,7 @@ assert 0 $? "Bulk should pass"
 # will be ignored and cause the listed to skip.
 EXPECTED_IGNORED="misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
 EXPECTED_SKIPPED="misc/foo-FLAVORS-unsorted@DEPIGNORED"
+EXPECTED_QUEUED="ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo-FLAVORS-unsorted@DEPIGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-main-dep-and-default-listed.sh b/test/bulk-flavor-main-dep-and-default-listed.sh
index 61215d5a..3a2960cf 100644
--- a/test/bulk-flavor-main-dep-and-default-listed.sh
+++ b/test/bulk-flavor-main-dep-and-default-listed.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="misc/freebsd-release-manifests ports-mgmt/poudriere-devel"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-main-dep-and-specific-listed.sh b/test/bulk-flavor-main-dep-and-specific-listed.sh
index 3a92197b..56d4b6a5 100644
--- a/test/bulk-flavor-main-dep-and-specific-listed.sh
+++ b/test/bulk-flavor-main-dep-and-specific-listed.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-DEFAULT"
+EXPECTED_LISTED="misc/freebsd-release-manifests@FOO ports-mgmt/poudriere-devel-dep-DEFAULT"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-main-dep.sh b/test/bulk-flavor-main-dep.sh
index e31b8bc8..b6fc59d2 100644
--- a/test/bulk-flavor-main-dep.sh
+++ b/test/bulk-flavor-main-dep.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-DEFAULT"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel-dep-DEFAULT"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-metadata-queue-ordering-multi-pass.sh b/test/bulk-flavor-metadata-queue-ordering-multi-pass.sh
index fe9cfd98..98fb3d5f 100644
--- a/test/bulk-flavor-metadata-queue-ordering-multi-pass.sh
+++ b/test/bulk-flavor-metadata-queue-ordering-multi-pass.sh
@@ -29,4 +29,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/foo@FLAV misc/freebsd-release-manifests misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/yyyy ports-mgmt/zzzz"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/yyyy ports-mgmt/zzzz"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-metadata-queue-ordering.sh b/test/bulk-flavor-metadata-queue-ordering.sh
index 46729ad4..68316334 100644
--- a/test/bulk-flavor-metadata-queue-ordering.sh
+++ b/test/bulk-flavor-metadata-queue-ordering.sh
@@ -9,4 +9,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/zzzz"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/zzzz"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-default-listed.sh b/test/bulk-flavor-specific-dep-and-default-listed.sh
index 15736a72..e2681cc4 100644
--- a/test/bulk-flavor-specific-dep-and-default-listed.sh
+++ b/test/bulk-flavor-specific-dep-and-default-listed.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-default-shorthand-listed.sh b/test/bulk-flavor-specific-dep-and-default-shorthand-listed.sh
index 386dfc0d..7ea016ba 100644
--- a/test/bulk-flavor-specific-dep-and-default-shorthand-listed.sh
+++ b/test/bulk-flavor-specific-dep-and-default-shorthand-listed.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-main-listed_default_all_off.sh b/test/bulk-flavor-specific-dep-and-main-listed_default_all_off.sh
index df54f9cd..3226bcfe 100644
--- a/test/bulk-flavor-specific-dep-and-main-listed_default_all_off.sh
+++ b/test/bulk-flavor-specific-dep-and-main-listed_default_all_off.sh
@@ -7,4 +7,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-main-listed_default_all_off_w_@all.sh b/test/bulk-flavor-specific-dep-and-main-listed_default_all_off_w_@all.sh
index 76dc8e9b..533c4573 100644
--- a/test/bulk-flavor-specific-dep-and-main-listed_default_all_off_w_@all.sh
+++ b/test/bulk-flavor-specific-dep-and-main-listed_default_all_off_w_@all.sh
@@ -8,4 +8,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-main-listed_default_all_on.sh b/test/bulk-flavor-specific-dep-and-main-listed_default_all_on.sh
index b7f4647b..09771cc9 100644
--- a/test/bulk-flavor-specific-dep-and-main-listed_default_all_on.sh
+++ b/test/bulk-flavor-specific-dep-and-main-listed_default_all_on.sh
@@ -8,4 +8,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo@- misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-multi-listed.sh b/test/bulk-flavor-specific-dep-and-multi-listed.sh
index 3f79c6b1..c59cfe5a 100644
--- a/test/bulk-flavor-specific-dep-and-multi-listed.sh
+++ b/test/bulk-flavor-specific-dep-and-multi-listed.sh
@@ -10,4 +10,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-multi-no-main-listed.sh b/test/bulk-flavor-specific-dep-and-multi-no-main-listed.sh
index b2ca2ceb..8279b8c7 100644
--- a/test/bulk-flavor-specific-dep-and-multi-no-main-listed.sh
+++ b/test/bulk-flavor-specific-dep-and-multi-no-main-listed.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep-and-specific-listed.sh b/test/bulk-flavor-specific-dep-and-specific-listed.sh
index 7a0e7165..2c46a986 100644
--- a/test/bulk-flavor-specific-dep-and-specific-listed.sh
+++ b/test/bulk-flavor-specific-dep-and-specific-listed.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="misc/freebsd-release-manifests@FOO ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-specific-dep.sh b/test/bulk-flavor-specific-dep.sh
index c08d0eea..2461a2f5 100644
--- a/test/bulk-flavor-specific-dep.sh
+++ b/test/bulk-flavor-specific-dep.sh
@@ -5,4 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel-dep-FOO"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel-dep-FOO"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-ignore-and-skipped.sh b/test/bulk-ignore-and-skipped.sh
index 018e2569..f1436115 100644
--- a/test/bulk-ignore-and-skipped.sh
+++ b/test/bulk-ignore-and-skipped.sh
@@ -7,7 +7,6 @@ JFLAG=1:1
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
-EXPECTED_LISTPORTS_IGNORED="misc/foop-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped"
 # ports-mgmt/poudriere-devel-IGNORED is a dependency which is also ignored but
 # because we are ignoring ports-mgmt/poudriere-devel-IGNORED-and-skipped we
 # should not bother processing ports-mgmt/poudriere-devel-IGNORED at all.
@@ -15,4 +14,7 @@ EXPECTED_LISTPORTS_IGNORED="misc/foop-IGNORED ports-mgmt/poudriere-devel-IGNORED
 # misc/foop-IGNORED should not cause a skip here either.
 EXPECTED_IGNORED="misc/foop-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped"
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="misc/foop-IGNORED ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-IGNORED-and-skipped"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-ignore-dep-skipped.sh b/test/bulk-ignore-dep-skipped.sh
index e6fcec37..494d04c6 100644
--- a/test/bulk-ignore-dep-skipped.sh
+++ b/test/bulk-ignore-dep-skipped.sh
@@ -10,11 +10,11 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
-EXPECTED_LISTPORTS_NOIGNORED="ports-mgmt/poudriere-devel"
 # This would default to ports-mgmt/poudriere-devel-dep-IGNORED but it is
 # expected to be skipped here.
-EXPECTED_LISTPORTS_IGNORED=
 EXPECTED_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
 EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED"
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-dep-IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-ignore-listed-dep.sh b/test/bulk-ignore-listed-dep.sh
index b405aa47..e99fb7e5 100644
--- a/test/bulk-ignore-listed-dep.sh
+++ b/test/bulk-ignore-listed-dep.sh
@@ -7,7 +7,8 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
-EXPECTED_LISTPORTS_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
 EXPECTED_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
+EXPECTED_QUEUED="misc/foo misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="misc/foo ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-ignore-listed-skipped-dep.sh b/test/bulk-ignore-listed-skipped-dep.sh
index d25033db..f2f9d048 100644
--- a/test/bulk-ignore-listed-skipped-dep.sh
+++ b/test/bulk-ignore-listed-skipped-dep.sh
@@ -10,9 +10,9 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
-EXPECTED_LISTPORTS_NOIGNORED="ports-mgmt/poudriere-devel"
-EXPECTED_LISTPORTS_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
 EXPECTED_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
 EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED"
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-dep-IGNORED"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-ignore-listed.sh b/test/bulk-ignore-listed.sh
index 5b85e348..9cdf3862 100644
--- a/test/bulk-ignore-listed.sh
+++ b/test/bulk-ignore-listed.sh
@@ -7,7 +7,9 @@ OVERLAYS="omnibus"
 do_bulk -n ${LISTPORTS}
 assert 0 $? "Bulk should pass"
 
-EXPECTED_LISTPORTS_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
 EXPECTED_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
 EXPECTED_SKIPPED=
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg ports-mgmt/poudriere-devel"
+EXPECTED_LISTED="ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-IGNORED"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-no-overlay-specific.sh b/test/bulk-no-overlay-specific.sh
index 77475300..6403eb8b 100644
--- a/test/bulk-no-overlay-specific.sh
+++ b/test/bulk-no-overlay-specific.sh
@@ -11,4 +11,7 @@ hash_get originspec-pkgname "misc/foo" pkgname || ret=$?
 assert 0 "${ret}" "Cannot find pkgname for misc/foo"
 assert "foo-20161010" "${pkgname}" "misc/foo found the overlay version maybe?"
 
+EXPECTED_QUEUED="misc/foo ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-overlay-all.sh b/test/bulk-overlay-all.sh
index f04f6404..df57b62b 100644
--- a/test/bulk-overlay-all.sh
+++ b/test/bulk-overlay-all.sh
@@ -13,5 +13,7 @@ assert "foo-OVERLAY-20161010" "${pkgname}" "misc/foo didn't find the overlay ver
 
 EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@IGNORED_OVERLAY ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped misc/foop-IGNORED misc/foo-all-IGNORED@DEFAULT misc/foo-all-IGNORED@FLAV misc/foo-default-IGNORED@DEFAULT misc/foo-all-DEPIGNORED@FLAV"
 EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED misc/foo-all-DEPIGNORED@DEFAULT misc/foo-default-DEPIGNORED@DEFAULT"
+EXPECTED_QUEUED="converters/libiconv devel/ccache devel/gettext devel/gettext-runtime devel/gettext-tools devel/libffi devel/libtextstyle devel/pkgconf devel/readline lang/perl5.30 lang/python lang/python2 lang/python27 lang/python3 lang/python37 misc/foo misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@FLAV misc/foo-default-DEPIGNORED@FLAV misc/foo-default-IGNORED@FLAV misc/foo-dep-FLAVORS-unsorted misc/foo-dep-FLAVORS-unsorted@FLAV misc/foo@FLAV misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-dep-DEFAULT ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/yyyy ports-mgmt/zzzz print/indexinfo security/openssl"
+EXPECTED_LISTED="converters/libiconv devel/ccache devel/gettext devel/gettext-runtime devel/gettext-tools devel/libffi devel/libtextstyle devel/pkgconf devel/readline lang/perl5.30 lang/python lang/python2 lang/python27 lang/python3 lang/python37 misc/foo misc/foo-FLAVORS-unsorted misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-FLAVORS-unsorted@FLAV misc/foo-FLAVORS-unsorted@IGNORED misc/foo-all-DEPIGNORED misc/foo-all-DEPIGNORED@FLAV misc/foo-all-IGNORED misc/foo-all-IGNORED@FLAV misc/foo-default-DEPIGNORED misc/foo-default-DEPIGNORED@FLAV misc/foo-default-IGNORED misc/foo-default-IGNORED@FLAV misc/foo-dep-FLAVORS-unsorted misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@FLAV misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@FLAV misc/foo@IGNORED_OVERLAY misc/foop-IGNORED misc/freebsd-release-manifests misc/freebsd-release-manifests@BAR misc/freebsd-release-manifests@FOO ports-mgmt/pkg ports-mgmt/poudriere-devel ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped ports-mgmt/poudriere-devel-dep-DEFAULT ports-mgmt/poudriere-devel-dep-FOO ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED ports-mgmt/yyyy ports-mgmt/zzzz print/indexinfo security/openssl"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-overlay-specific.sh b/test/bulk-overlay-specific.sh
index b6fab76b..65fc46a3 100644
--- a/test/bulk-overlay-specific.sh
+++ b/test/bulk-overlay-specific.sh
@@ -11,4 +11,7 @@ hash_get originspec-pkgname "misc/foo" pkgname || ret=$?
 assert 0 "${ret}" "Cannot find pkgname for misc/foo"
 assert "foo-OVERLAY-20161010" "${pkgname}" "misc/foo didn't find the overlay version"
 
+EXPECTED_QUEUED="misc/foo ports-mgmt/pkg"
+EXPECTED_LISTED="misc/foo"
+
 assert_bulk_queue_and_stats
diff --git a/test/bulk-skipped-and-needed-dep.sh b/test/bulk-skipped-and-needed-dep.sh
index b888ac0d..6bcc2e6a 100644
--- a/test/bulk-skipped-and-needed-dep.sh
+++ b/test/bulk-skipped-and-needed-dep.sh
@@ -17,7 +17,7 @@ assert 0 $? "Bulk should pass"
 
 EXPECTED_IGNORED="ports-mgmt/poudriere-devel-IGNORED"
 EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED"
+EXPECTED_QUEUED="misc/freebsd-release-manifests ports-mgmt/pkg"
+EXPECTED_LISTED="misc/freebsd-release-manifests ports-mgmt/poudriere-devel-dep-IGNORED"
 
 assert_bulk_queue_and_stats
-
-
diff --git a/test/common.bulk.sh b/test/common.bulk.sh
index 11878248..1fb9dee9 100644
--- a/test/common.bulk.sh
+++ b/test/common.bulk.sh
@@ -106,9 +106,6 @@ cache_pkgnames() {
 	# Record all known packages for comparing to the queue later.
 	ALL_PKGNAMES="${ALL_PKGNAMES}${ALL_PKGNAMES:+ }${pkgname}"
 	ALL_ORIGINS="${ALL_ORIGINS}${ALL_ORIGINS:+ }${originspec}"
-	if [ -n "${ignore}" ]; then
-		list_add IGNOREDPORTS "${flavor_originspec}"
-	fi
 	was_listed_with_flavor=0
 	if [ -n "${flavors}" ]; then
 		default_flavor="${flavors%% *}"
@@ -129,12 +126,8 @@ cache_pkgnames() {
 		for dep_origin in ${pdeps}; do
 			if cache_pkgnames 1 "${dep_origin}"; then
 				if [ "${was_listed_with_flavor}" -eq 1 ]; then
-					list_add IGNOREDPORTS "${flavor_originspec}"
 					continue
 				fi
-				if ! list_contains SKIPPEDPORTS "${flavor_originspec}"; then
-					list_add SKIPPEDPORTS "${flavor_originspec}"
-				fi
 			fi
 		done
 	fi
@@ -480,66 +473,23 @@ sorted() {
 
 assert_bulk_queue_and_stats() {
 	local expanded_LISTPORTS_NOIGNORED
-	local EXPECTED_LISTPORTS_IGNORED EXPECTED_LISTPORTS_NOIGNORED
 	local port
 	local -
 
 	set -u
-
-	# Some defaults based on passed in expectations. Assume nothing is
-	# ignored unless told otherwise.
-	if [ -n "${EXPECTED_LISTPORTS_IGNORED+set}" ] &&
-		[ -z "${EXPECTED_LISTPORTS_NOIGNORED+set}" ]; then
-		EXPECTED_LISTPORTS_NOIGNORED="${LISTPORTS}"
-		for port in ${EXPECTED_LISTPORTS_IGNORED}; do
-			list_remove EXPECTED_LISTPORTS_NOIGNORED "${port}" || :
-		done
-	elif [ -n "${EXPECTED_LISTPORTS_NOIGNORED+set}" ] &&
-		[ -z "${EXPECTED_LISTPORTS_IGNORED+set}" ]; then
-		EXPECTED_LISTPORTS_IGNORED="${LISTPORTS}"
-		for port in ${EXPECTED_LISTPORTS_NOIGNORED}; do
-			list_remove EXPECTED_LISTPORTS_IGNORED "${port}" || :
-		done
-	elif [ -z "${EXPECTED_LISTPORTS_NOIGNORED+set}" ] &&
-		[ -z "${EXPECTED_LISTPORTS_IGNORED+set}" ]; then
-		# This is highly dependent on the test framework
-		EXPECTED_LISTPORTS_NOIGNORED="${LISTPORTS_NOIGNORED}"
-		EXPECTED_LISTPORTS_IGNORED="${LISTPORTS_IGNORED}"
-	fi
-
-	# Assert the listed which are ignored is right
-	# This is testing the test framework
-	assert_list EXPECTED_LISTPORTS_IGNORED LISTPORTS_IGNORED \
-		"(test framework) LISTPORTS_IGNORED should match"
-
-	# Assert the non-ignored ports list is right
-	# This is testing the test framework
-	assert_list EXPECTED_LISTPORTS_NOIGNORED LISTPORTS_NOIGNORED \
-		"(test framework) LISTPORTS_NOIGNORED should match"
-
-	# Assert that IGNOREDPORTS was populated by the framework right.
-	# This is testing the test framework
-	assert_list EXPECTED_IGNORED IGNOREDPORTS \
-		"(test framework) IGNOREDPORTS should match"
-
-	# Assert that skipped ports are right
-	# This is testing the test framework
-	assert_list EXPECTED_SKIPPED SKIPPEDPORTS \
-		"(test framework) SKIPPEDPORTS should match"
-
 	### Now do tests against the output of the bulk run. ###
 
 	# Assert that only listed packages are in poudriere.ports.queued as
 	# 'listed'
-	if [ -z "${EXPECTED_QUEUED_LISTED-}" ]; then
+	if [ -z "${EXPECTED_LISTED-}" ]; then
 		# compat for tests
 		if [ -z "${EXPECTED_QUEUED-null}" ]; then
-			EXPECTED_QUEUED_LISTED=
+			EXPECTED_LISTED=
 		else
-			EXPECTED_QUEUED_LISTED="${LISTPORTS}"
+			EXPECTED_LISTED="${LISTPORTS}"
 		fi
 	fi
-	assert_queued "listed" "${EXPECTED_QUEUED_LISTED-}"
+	assert_queued "listed" "${EXPECTED_LISTED-}"
 
 	# Assert the IGNOREd ports are tracked in .poudriere.ports.ignored
 	assert_ignored "${EXPECTED_IGNORED-}"
@@ -549,11 +499,6 @@ assert_bulk_queue_and_stats() {
 
 	# Assert that all expected dependencies are in poudriere.ports.queued
 	# (since they do not exist yet)
-	if [ -z "${EXPECTED_QUEUED+set}" ]; then
-		expand_origin_flavors "${LISTPORTS_NOIGNORED}" \
-			expanded_LISTPORTS_NOIGNORED
-		list_all_deps "${expanded_LISTPORTS_NOIGNORED}" EXPECTED_QUEUED
-	fi
 	assert_queued "" "${EXPECTED_QUEUED-}"
 
 	# Assert stats counts are right
@@ -741,35 +686,11 @@ if [ "${FLAVOR_DEFAULT_ALL-null}" == "yes" ]; then
 	    sed -e 's,$,@all,' | paste -s -d ' ' -)"
 fi
 echo -n "Gathering metadata for requested ports..."
-IGNOREDPORTS=""
-SKIPPEDPORTS=""
-LISTPORTS_IGNORED=""
 for origin in ${LISTPORTS}; do
 	cache_pkgnames 0 "${origin}" || :
 done
 echo " done"
-IGNOREDPORTS="$(sorted "${IGNOREDPORTS}")"
-SKIPPEDPORTS="$(sorted "${SKIPPEDPORTS}")"
 expand_origin_flavors "${LISTPORTS}" LISTPORTS_EXPANDED
-# Separate out IGNORED ports
-LISTPORTS_NOIGNORED="${LISTPORTS_EXPANDED}"
-if [ -n "${IGNOREDPORTS}" ]; then
-	_IGNOREDPORTS="${IGNOREDPORTS}"
-	for port in ${_IGNOREDPORTS}; do
-		if list_contains LISTPORTS "${port}"; then
-			list_add LISTPORTS_IGNORED "${port}" || :
-		fi
-		list_remove LISTPORTS_NOIGNORED "${port}" || :
-		list_remove SKIPPEDPORTS "${port}" || :
-	done
-fi
-# Separate out SKIPPED ports
-if [ -n "${SKIPPEDPORTS}" ]; then
-	_SKIPPEDPORTS="${SKIPPEDPORTS}"
-	for port in ${_SKIPPEDPORTS}; do
-		list_remove LISTPORTS_NOIGNORED "${port}" || :
-	done
-fi
 fetch_global_port_vars || err 99 "Unable to fetch port vars"
 assert_not "null" "${P_PORTS_FEATURES-null}" "fetch_global_port_vars should work"
 echo "Building: $(echo ${LISTPORTS_EXPANDED})"