This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8500

tests: use regular POSIX shell
ClosedPublic

Authored by joerg.sonnenberger on May 7 2020, 9:02 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGf727939f3513: tests: use regular POSIX shell

Summary

wait-on-file requires one POSIX extension (sleep with non-integral
argument), but it doesn't require any bash extensions, so just require a
normal POSIX shell. While here, use consistent formatting without
redundant ;

Diff Detail

Repository

rHG Mercurial

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

joerg.sonnenberger created this revision.May 7 2020, 9:02 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMay 7 2020, 9:02 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

joerg.sonnenberger added a child revision: D8501: tests: increase internal timeouts.May 7 2020, 9:03 AM

Moving to /bin/sh seems fine. Did you run tests for this patch on debian/dash ? (pushing to heptapod should do it)

tests/testlib/wait-on-file
26	Unrelated gratuitous change ?
31	same here

joerg.sonnenberger added a commit: rHGf727939f3513: tests: use regular POSIX shell.May 7 2020, 10:58 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGf727939f3513: tests: use regular POSIX shell (authored by joerg.sonnenberger). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/testlib/wait-on-file (8 lines)

Commit	Parents	Author	Summary	Date
fd99b62b86b6	d0ae37de6d2c	Joerg Sonnenberger		May 7 2020, 9:00 AM

	Status	Author	Revision
	Abandoned	joerg.sonnenberger	D8501 tests: increase internal timeouts
	Closed	joerg.sonnenberger	D8500 tests: use regular POSIX shell

Diff 21277

tests/testlib/wait-on-file

	#!/bin/bash			#!/bin/sh
	#			#
	# wait up to TIMEOUT seconds until a WAIT_ON_FILE is created.			# wait up to TIMEOUT seconds until a WAIT_ON_FILE is created.
	#			#
	# In addition, this script can create CREATE_FILE once it is ready to wait.			# In addition, this script can create CREATE_FILE once it is ready to wait.

	if [ $# -lt 2 ] \|\| [ $# -gt 3 ]; then			if [ $# -lt 2 ] \|\| [ $# -gt 3 ]; then
	echo $#			echo $#
	echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]"			echo "USAGE: $0 TIMEOUT WAIT_ON_FILE [CREATE_FILE]"
	fi			fi

	timer="$1"			timer="$1"

	# if the test timeout have been extended, explicitly extend the provided timer			# if the test timeout have been extended, explicitly extend the provided timer
	if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then			if [ "$HGTEST_TIMEOUT_DEFAULT" -lt "$HGTEST_TIMEOUT" ]; then
	timer=$(( ( 100 * $timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT ))			timer=$(( ( 100 * $timer * $HGTEST_TIMEOUT) / $HGTEST_TIMEOUT_DEFAULT ))
	fi			fi

	wait_on="$2"			wait_on="$2"
	create=""			create=""
	if [ $# -eq 3 ]; then			if [ $# -eq 3 ]; then
	create="$3"			create="$3"
	fi			fi

	if [ -n "$create" ];			if [ -n "$create" ]; then
	then
	marmouteUnsubmitted Not Done Unrelated gratuitous change ? marmoute: Unrelated gratuitous change ?
	touch "$create"			touch "$create"
	create=""			create=""
	fi			fi
	while [ "$timer" -gt 0 ] && [ ! -f "$wait_on" ];			while [ "$timer" -gt 0 ] && [ ! -f "$wait_on" ]; do
	do
	marmouteUnsubmitted Not Done same here marmoute: same here
	timer=$(( $timer - 1))			timer=$(( $timer - 1))
	sleep 0.01			sleep 0.01
	done			done
	if [ "$timer" -le 0 ]; then			if [ "$timer" -le 0 ]; then
	echo "file not created after $1 seconds: $wait_on" >&2			echo "file not created after $1 seconds: $wait_on" >&2
	exit 1			exit 1
	fi			fi

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21277		May 7 2020, 9:02 AM	★	★
Diff 2	21280	rHGf727939f3513f4ae2600bfa8fa96026048855106	May 7 2020, 9:00 AM	★	★