mail-client/neomutt: Add unit tests #16886

nicolasbock · 2020-07-28T18:11:41Z

This change addds unit tests to neomutt. Those tests come in a separate
package as upstream maintains them in a separate repository.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=734122
Signed-off-by: Nicolas Bock nicolasbock@gentoo.org

gentoo-bot · 2020-07-28T18:12:13Z

Pull Request assignment

Submitter: @nicolasbock
Areas affected: ebuilds
Packages affected: mail-client/neomutt, mail-client/neomutt-test-files

mail-client/neomutt: @nicolasbock
mail-client/neomutt-test-files: @gentoo/proxy-maint (new package)

Linked bugs

Bugs linked: 734122

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

juippis · 2020-07-29T13:20:30Z

mail-client/neomutt-test-files/neomutt-test-files-20200626.ebuild

+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""


These are all just waste of space in the ebuild and can be removed if you wish so.

juippis · 2020-07-29T13:20:59Z

mail-client/neomutt-test-files/neomutt-test-files-20200626.ebuild

+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	mv "${WORKDIR}/${PN}-${UPSTREAM_COMMIT}" "${WORKDIR}/${P}"
+}


You can just define S="..." before any src_ phases, making all this redundant as well.

juippis · 2020-07-29T13:21:15Z

mail-client/neomutt-test-files/neomutt-test-files-20200626.ebuild

+
+src_prepare() {
+	eapply_user
+	NEOMUTT_TEST_DIR="${S}" ./setup.sh


External commands need to be appended with || die.

juippis · 2020-07-29T13:21:24Z

mail-client/neomutt-test-files/neomutt-test-files-20200626.ebuild

+
+src_install() {
+	dodir /usr/share/${P}
+	cp --archive "${S}" /usr/share


Here too, || die.

thesamesam

I get this (snippet):


./mbox/
./mbox/apple.mbox
tar: ./mbox/endive.mbox: Cannot open: Permission denied
./mbox/fig.mbox
./mbox/damson.mbox/
./mbox/damson.mbox/.gitignore
./mbox/symlink
./mbox/banana.mbox
./mbox/cherry.mbox
tar: Exiting with failure status due to previous errors
 �[31;01m*�[0m ERROR: mail-client/neomutt-test-files-20200626::gentoo failed (prepare phase):
 �[31;01m*�[0m   Failed to tar the test files

neomutt-test-files.log

thesamesam · 2020-08-01T22:56:42Z

mail-client/neomutt/neomutt-20200626-r1.ebuild

 	)

 	econf CCACHE=none "${myconf[@]}"
 }

+src_test() {
+	local test_dir=$(mktemp --directory)
+	tar -C ${test_dir} -xvf /usr/share/neomutt-test-files-${PV}/neomutt-test-files-${PV}.tar.gz


thesamesam · 2020-08-01T22:56:53Z

mail-client/neomutt/neomutt-20200626-r1.ebuild

+	local test_dir=$(mktemp --directory)
+	tar -C ${test_dir} -xvf /usr/share/neomutt-test-files-${PV}/neomutt-test-files-${PV}.tar.gz
+	NEOMUTT_TEST_DIR=${test_dir} emake test
+	rm -rf ${test_dir}


thesamesam · 2020-08-01T23:00:18Z

mail-client/neomutt/neomutt-20200626-r1.ebuild

 	)

 	econf CCACHE=none "${myconf[@]}"
 }

+src_test() {
+	local test_dir=$(mktemp --directory)


I think we may need to either put || die inside the subshell (ok on >= EAPI 7)

... or check if it's a directory with a Bash test ([[ -d ... ]]) afterwards, and die if it isn't.

nicolasbock · 2020-08-22T20:23:36Z

@juippis and @thesamesam Sorry this revision took a little. Could you have another look please? Thanks!

gentoo-repo-qa-bot · 2020-08-22T21:01:22Z

Pull request CI report

Report generated at: 2020-08-22 21:01 UTC
Newest commit scanned: d4ab0b7
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/6d7a080e7a/output.html

gentoo-repo-qa-bot · 2020-08-22T21:21:00Z

Pull request CI report

Report generated at: 2020-08-22 21:21 UTC
Newest commit scanned: 7752888
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/900b5fd3e9/output.html

gentoo-repo-qa-bot · 2020-08-22T21:41:04Z

Pull request CI report

Report generated at: 2020-08-22 21:41 UTC
Newest commit scanned: fe2d556
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/07d608b81d/output.html

juippis · 2020-08-24T14:22:07Z

mail-client/neomutt-test-files/Manifest

@@ -0,0 +1 @@
+DIST neomutt-test-files-1.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3


We have rules how to name packages such as this,
https://devmanual.gentoo.org/ebuild-writing/file-format/index.html#snapshots-and-live-ebuilds

neomutt-test-files-0_pre20200618.ebuild
So when -1.0 is released, it's going to be higher than the snapshot version.

juippis · 2020-08-24T14:22:36Z

mail-client/neomutt-test-files/neomutt-test-files-1.ebuild

+src_unpack() {
+	if [[ -n ${A} ]]; then
+		mkdir --verbose -p "${S}" || die "Could not create ${S}"
+	fi
+}
+
+src_prepare() {
+	if [[ -n ${A} ]]; then
+		cd "${DISTDIR}" || die "Could not cd into DISTDIR"
+		cp --verbose ${A[@]} "${S}" || die "Could not copy package"
+	fi
+	eapply_user
+}


All of this seems rather redundant to me. It should just work if you define S, as you've done?

Rest look ok!

Maybe. I don't care about unpacking the source though. I would like to package the tar file so that I can unpack it during the testing phase of the neomutt package. Defining S would not help there. Or am I missing something?

Okay, would it then be possible to just do this in the neomutt ebuild? If I understood correctly, the contents of this package is just required on neomutt for testing phase, and not really needed to be installed on / to run the tests?

Well, that's a good point 😄 I hadn't thought of that. Please have a look at the updated PR.

gentoo-repo-qa-bot · 2020-08-25T17:50:10Z

Pull request CI report

Report generated at: 2020-08-25 17:50 UTC
Newest commit scanned: 0378824
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/512af81846/output.html

thesamesam

Pop the version number in 'version bump' commits (like version bump to N) and it's looking great to me. All tests are passing now too! 💯

thesamesam · 2020-08-25T18:12:02Z

mail-client/neomutt/neomutt-20200821.ebuild

+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd


thesamesam · 2020-08-25T18:13:05Z

mail-client/neomutt/neomutt-20200821.ebuild

+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )


We link against openssl/libressl and they have a subslot, so we should use := on these two to make sure we get rebuilt if they break ABI compatibility

thesamesam · 2020-08-25T18:13:46Z

mail-client/neomutt/neomutt-20200821.ebuild

+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )


Link against ncurses and it has a subslot (check ebuild and see if it has a SOMETHING/N as SLOT, where N is the subslot -- it's ok if SOMETHING is 0), so let's subscribe to it: :=

I'll let you check the others to see if we need more subscriptions! 😃

thesamesam · 2020-08-25T18:14:41Z

mail-client/neomutt/neomutt-20200821.ebuild

+
+EAPI=7
+
+inherit eutils flag-o-matic


When I skimmed, I wasn't sure if we were using flag-o-matic anymore

This change addds unit tests to neomutt. Those tests come from a separate repository. Closes: https://bugs.gentoo.org/734122 Closes: https://bugs.gentoo.org/728886 Signed-off-by: Nicolas Bock <nicolasbock@gentoo.org>

Signed-off-by: Nicolas Bock <nicolasbock@gentoo.org>

gentoo-repo-qa-bot · 2020-08-25T20:10:13Z

Pull request CI report

Report generated at: 2020-08-25 20:10 UTC
Newest commit scanned: 1732db8
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/fbb3f6a36c/output.html

nicolasbock · 2020-08-26T11:46:04Z

Merged.

nicolasbock force-pushed the neomutt-tests branch 4 times, most recently from bde6a09 to 605f853 Compare July 29, 2020 13:05

juippis reviewed Jul 29, 2020

View reviewed changes

nicolasbock force-pushed the neomutt-tests branch 4 times, most recently from 5e00bf1 to 4cca854 Compare July 29, 2020 16:04

thesamesam self-requested a review August 1, 2020 01:27

thesamesam reviewed Aug 1, 2020

View reviewed changes

nicolasbock force-pushed the neomutt-tests branch 2 times, most recently from 5026956 to 0aa3d97 Compare August 22, 2020 20:22

nicolasbock force-pushed the neomutt-tests branch 2 times, most recently from d4ab0b7 to 0d84c19 Compare August 22, 2020 20:53

nicolasbock force-pushed the neomutt-tests branch 2 times, most recently from 7752888 to fe2d556 Compare August 22, 2020 21:08

juippis reviewed Aug 24, 2020

View reviewed changes

nicolasbock force-pushed the neomutt-tests branch 2 times, most recently from 2e32ad9 to 0378824 Compare August 25, 2020 17:33

thesamesam reviewed Aug 25, 2020

View reviewed changes

nicolasbock force-pushed the neomutt-tests branch from 0378824 to 51b6f6a Compare August 25, 2020 19:13

nicolasbock added 2 commits August 25, 2020 13:36

mail-client/neomutt: Add unit tests

6df2e48

This change addds unit tests to neomutt. Those tests come from a separate repository. Closes: https://bugs.gentoo.org/734122 Closes: https://bugs.gentoo.org/728886 Signed-off-by: Nicolas Bock <nicolasbock@gentoo.org>

mail-client/neomutt: Version bump

1732db8

Signed-off-by: Nicolas Bock <nicolasbock@gentoo.org>

nicolasbock force-pushed the neomutt-tests branch from 51b6f6a to 1732db8 Compare August 25, 2020 19:36

nicolasbock closed this Aug 26, 2020

nicolasbock deleted the neomutt-tests branch September 25, 2020 14:47

		@@ -0,0 +1 @@
		DIST neomutt-test-files-1.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3


		EAPI=7

		inherit eutils flag-o-matic

mail-client/neomutt: Add unit tests #16886

mail-client/neomutt: Add unit tests #16886

Conversation

nicolasbock commented Jul 28, 2020

gentoo-bot commented Jul 28, 2020

Pull Request assignment

Linked bugs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thesamesam left a comment

Choose a reason for hiding this comment

thesamesam Aug 1, 2020 • edited

Choose a reason for hiding this comment

thesamesam Aug 1, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thesamesam Aug 1, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicolasbock commented Aug 22, 2020

gentoo-repo-qa-bot commented Aug 22, 2020

Pull request CI report

gentoo-repo-qa-bot commented Aug 22, 2020

Pull request CI report

gentoo-repo-qa-bot commented Aug 22, 2020

Pull request CI report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Aug 25, 2020

Pull request CI report

thesamesam left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Aug 25, 2020

Pull request CI report

nicolasbock commented Aug 26, 2020

thesamesam Aug 1, 2020 •

edited

thesamesam Aug 1, 2020 •

edited

thesamesam Aug 1, 2020 •

edited