public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/
Date: Wed, 12 Jun 2024 15:35:36 +0000 (UTC)	[thread overview]
Message-ID: <1718206531.2a7763a875ff6f4a74b6c40c0238a50febcfafab.mgorny@gentoo> (raw)

commit:     2a7763a875ff6f4a74b6c40c0238a50febcfafab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 15:34:29 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 15:35:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7763a8

eclass/tests: Remove git-r3.sh

Remove base git-r3 tests, they are broken for a long time and I can't
figure out how to fix them properly.  There is probably no point
in testing these functions standalone anyway since they're extensively
used by ebuilds.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/tests/git-r3.sh | 208 -------------------------------------------------
 1 file changed, 208 deletions(-)

diff --git a/eclass/tests/git-r3.sh b/eclass/tests/git-r3.sh
deleted file mode 100755
index 02cbcbc59125..000000000000
--- a/eclass/tests/git-r3.sh
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# git no longer allows ext: protocol, meh
-exit 0
-
-EAPI=7
-
-source tests-common.sh || exit
-
-inherit git-r3
-
-testdir=${pkg_root}/git
-mkdir "${testdir}" || die "unable to mkdir testdir"
-cd "${testdir}" || die "unable to cd to testdir"
-
-EGIT3_STORE_DIR=store
-mkdir "${EGIT3_STORE_DIR}" || die "unable to mkdir store"
-
-test_file() {
-	local fn=${1}
-	local expect=${2}
-
-	if [[ ! -f ${fn} ]]; then
-		eerror "${fn} does not exist (not checked out?)"
-	else
-		local got=$(<"${fn}")
-
-		if [[ ${got} != ${expect} ]]; then
-			eerror "${fn}, expected: ${expect}, got: ${got}"
-		else
-			return 0
-		fi
-	fi
-	return 1
-}
-
-test_no_file() {
-	local fn=${1}
-
-	if [[ -f ${fn} ]]; then
-		eerror "${fn} exists (wtf?!)"
-	else
-		return 0
-	fi
-	return 1
-}
-
-test_repo_clean() {
-	local P=${P}_${FUNCNAME#test_}
-
-	(
-		mkdir repo
-		cd repo
-		git init -q
-		echo test > file
-		git add file
-		git commit -m 1 -q
-		echo other-text > file2
-		git add file2
-		git commit -m 2 -q
-	) || die "unable to prepare repo"
-
-	# we need to use an array to preserve whitespace
-	local EGIT_REPO_URI=(
-		"ext::git daemon --export-all --base-path=. --inetd %G/repo"
-	)
-
-	tbegin "fetching from a simple repo"
-	(
-		git-r3_src_unpack
-		test_file "${WORKDIR}/${P}/file" test && \
-		test_file "${WORKDIR}/${P}/file2" other-text
-	) &>fetch.log
-
-	eend ${?} || cat fetch.log
-}
-
-test_repo_revert() {
-	local P=${P}_${FUNCNAME#test_}
-
-	(
-		cd repo
-		git revert -n HEAD^
-		git commit -m r1 -q
-	) || die "unable to prepare repo"
-
-	# we need to use an array to preserve whitespace
-	local EGIT_REPO_URI=(
-		"ext::git daemon --export-all --base-path=. --inetd %G/repo"
-	)
-
-	tbegin "fetching revert"
-	(
-		git-r3_src_unpack
-		test_no_file "${WORKDIR}/${P}/file" && \
-		test_file "${WORKDIR}/${P}/file2" other-text
-	) &>fetch.log
-
-	eend ${?} || cat fetch.log
-}
-
-test_repo_branch() {
-	local P=${P}_${FUNCNAME#test_}
-
-	(
-		cd repo
-		git branch -q other-branch HEAD^
-		git checkout -q other-branch
-		echo one-more > file3
-		git add file3
-		git commit -m 3 -q
-		git checkout -q master
-	) || die "unable to prepare repo"
-
-	# we need to use an array to preserve whitespace
-	local EGIT_REPO_URI=(
-		"ext::git daemon --export-all --base-path=. --inetd %G/repo"
-	)
-	local EGIT_BRANCH=other-branch
-
-	tbegin "switching branches"
-	(
-		git-r3_src_unpack
-		test_file "${WORKDIR}/${P}/file" test && \
-		test_file "${WORKDIR}/${P}/file2" other-text && \
-		test_file "${WORKDIR}/${P}/file3" one-more
-	) &>fetch.log
-
-	eend ${?} || cat fetch.log
-}
-
-test_repo_merge() {
-	local P=${P}_${FUNCNAME#test_}
-
-	(
-		cd repo
-		git branch -q one-more-branch HEAD^
-		git checkout -q one-more-branch
-		echo foobarbaz > file3
-		git add file3
-		git commit -m 3b -q
-		git checkout -q master
-		git merge -m 4 -q one-more-branch
-	) || die "unable to prepare repo"
-
-	# we need to use an array to preserve whitespace
-	local EGIT_REPO_URI=(
-		"ext::git daemon --export-all --base-path=. --inetd %G/repo"
-	)
-
-	tbegin "fetching a merge commit"
-	(
-		git-r3_src_unpack
-		test_no_file "${WORKDIR}/${P}/file" && \
-		test_file "${WORKDIR}/${P}/file2" other-text && \
-		test_file "${WORKDIR}/${P}/file3" foobarbaz
-	) &>fetch.log
-
-	eend ${?} || cat fetch.log
-}
-
-test_repo_revert_merge() {
-	local P=${P}_${FUNCNAME#test_}
-
-	(
-		cd repo
-		git branch -q to-be-reverted
-		git checkout -q to-be-reverted
-		echo trrm > file3
-		git add file3
-		git commit -m 5b -q
-		git checkout -q master
-		echo trrm > file2
-		git add file2
-		git commit -m 5 -q
-		git merge -m 6 -q to-be-reverted
-		echo trrm > file
-		git add file
-		git commit -m 7 -q
-		git revert -m 1 -n HEAD^
-		git commit -m 7r -q
-	) || die "unable to prepare repo"
-
-	# we need to use an array to preserve whitespace
-	local EGIT_REPO_URI=(
-		"ext::git daemon --export-all --base-path=. --inetd %G/repo"
-	)
-
-	tbegin "fetching a revert of a merge commit"
-	(
-		git-r3_src_unpack
-		test_file "${WORKDIR}/${P}/file" trrm && \
-		test_file "${WORKDIR}/${P}/file2" trrm && \
-		test_file "${WORKDIR}/${P}/file3" foobarbaz
-	) &>fetch.log
-
-	eend ${?} || cat fetch.log
-}
-
-test_repo_clean
-test_repo_revert
-test_repo_branch
-test_repo_merge
-test_repo_revert_merge
-
-texit


             reply	other threads:[~2024-06-12 15:35 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-12 15:35 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-30 11:35 [gentoo-commits] repo/gentoo:master commit in: eclass/tests/ Michał Górny
2024-12-30 11:35 Michał Górny
2024-12-21  8:11 Michał Górny
2024-12-20 20:39 Michał Górny
2024-12-20 20:39 Michał Górny
2024-12-09 18:49 Ulrich Müller
2024-09-19  4:13 Sam James
2024-09-18 15:51 Sam James
2024-09-18 15:51 Sam James
2024-08-07  8:58 Andrew Ammerlaan
2024-08-07  8:58 Andrew Ammerlaan
2024-08-06  8:47 Michał Górny
2024-08-06  8:47 Michał Górny
2024-07-29 17:02 Michał Górny
2024-07-28  9:32 Ulrich Müller
2024-06-13 19:53 Ulrich Müller
2024-06-13 19:53 Ulrich Müller
2024-06-13 18:35 Ulrich Müller
2024-06-13 18:35 Ulrich Müller
2024-06-12 16:47 Ulrich Müller
2024-06-12 15:32 Ulrich Müller
2024-06-12  9:47 Ulrich Müller
2024-05-25  8:24 Ulrich Müller
2023-11-03 19:00 Michał Górny
2023-09-14  5:30 Michał Górny
2023-06-18 14:57 Michał Górny
2023-06-17 10:10 Michał Górny
2023-06-15 12:19 Michał Górny
2023-05-23  4:36 Michał Górny
2023-05-01 13:43 Sam James
2023-04-20 23:14 Sam James
2022-12-14 10:18 Michał Górny
2022-10-28  8:24 Michał Górny
2022-10-15 17:35 Mike Gilbert
2022-10-10 20:52 Michał Górny
2022-10-01 17:19 Michał Górny
2022-10-01 17:19 Michał Górny
2022-09-27 20:28 Michał Górny
2022-05-09 20:33 Michał Górny
2022-05-09 20:33 Michał Górny
2022-04-21 15:19 Michał Górny
2022-04-19 21:32 Mike Gilbert
2022-02-14 21:13 Mike Gilbert
2022-02-14 17:25 Mike Gilbert
2021-12-31  9:10 Michał Górny
2021-12-31  9:10 Michał Górny
2021-12-31  9:10 Michał Górny
2021-06-22 20:44 David Seifert
2021-05-12 20:55 Mike Gilbert
2021-05-12 19:39 Michał Górny
2021-05-05 18:20 Michał Górny
2021-03-28 11:48 Michał Górny
2020-11-23 18:11 Ulrich Müller
2020-07-02  8:29 Michał Górny
2020-07-02  8:29 Michał Górny
2020-07-02  8:29 Michał Górny
2020-07-02  8:29 Michał Górny
2020-06-19 11:52 Michał Górny
2020-05-28 11:41 Michał Górny
2020-05-10  1:02 Sergei Trofimovich
2020-04-30  9:45 Michał Górny
2020-04-19 16:47 Michał Górny
2020-03-30 13:11 Michał Górny
2020-03-30 11:57 Michał Górny
2020-03-27 23:54 Sergei Trofimovich
2020-02-27 16:29 Michał Górny
2020-02-09 18:09 Michał Górny
2019-12-23 11:47 Sergei Trofimovich
2019-12-13 22:37 Sergei Trofimovich
2019-12-07 16:59 Michał Górny
2019-12-01 11:29 Sergei Trofimovich
2019-11-24 15:09 Michał Górny
2019-11-20 20:30 Sergei Trofimovich
2019-11-20 19:51 Sergei Trofimovich
2019-11-20  9:23 Michał Górny
2019-11-20  9:16 Michał Górny
2019-11-20  9:15 Michał Górny
2019-11-20  9:00 Michał Górny
2019-11-20  9:00 Michał Górny
2019-11-20  9:00 Michał Górny
2019-11-20  8:46 Michał Górny
2019-11-20  8:46 Michał Górny
2019-11-20  8:46 Michał Górny
2019-11-20  7:47 Michał Górny
2019-11-06 22:44 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2017-09-19 13:15 Michał Górny
2017-09-14 19:05 Mike Gilbert
2017-08-08 19:42 Michał Górny
2017-04-14 16:28 Michał Górny
2017-03-08  7:35 Michał Górny
2016-06-27  5:58 Michał Górny
2016-01-08  5:14 Michał Górny
2015-12-09 20:42 Michał Górny
2015-11-21 19:58 Ulrich Müller
2015-11-12 16:03 Michał Górny
2015-11-11 10:27 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1718206531.2a7763a875ff6f4a74b6c40c0238a50febcfafab.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox