Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 47491b1
Add a NO_TICK env var to simplify writing regression tests and fix regressions test
Baptiste Daroussin committed 10 years ago
commit 47491b1ce3362939064364548871bda3348e5cb5
parent 4e211d1
9 files changed +48 -48
modified src/event.c
@@ -395,7 +395,7 @@ progressbar_tick(int64_t current, int64_t total)
		else {

			if (progress_interrupted) {

				printf("%s...", progress_message);
- 
			} else {
+ 
			} else if (!getenv("NO_TICK")){

				percent = (total != 0) ? (current * 100. / total) : 100;

				if (last_progress_percent / 10 < percent / 10) {

					last_progress_percent = percent;
modified tests/frontend/add.shin
@@ -45,7 +45,7 @@ add_body() {


OUTPUT="${JAILED}Installing test-1...

pre-install
- 
${JAILED}Extracting test-1... done
+ 
${JAILED}Extracting test-1:  done

post-install

"

	atf_check \
@@ -69,7 +69,7 @@ add_automatic_body() {


OUTPUT="${JAILED}Installing test-1...

pre-install
- 
${JAILED}Extracting test-1... done
+ 
${JAILED}Extracting test-1:  done

post-install

"

	atf_check \
@@ -92,7 +92,7 @@ add_noscript_body() {
	initialize_pkg



OUTPUT="${JAILED}Installing test-1...
- 
${JAILED}Extracting test-1... done
+ 
${JAILED}Extracting test-1:  done

"

	cat test-1.txz | atf_check \

		-o inline:"${OUTPUT}" \
@@ -159,7 +159,7 @@ EOF


OUTPUT="${JAILED}Installing test-1...

pre-install
- 
${JAILED}Extracting test-1... done
+ 
${JAILED}Extracting test-1:  done

post-install

"

	atf_check \
@@ -191,7 +191,7 @@ add_stdin_body() {


OUTPUT="${JAILED}Installing test-1...

pre-install
- 
${JAILED}Extracting test-1... done
+ 
${JAILED}Extracting test-1:  done

post-install

"

	cat test-1.txz | atf_check \
@@ -253,7 +253,7 @@ EOF


OUTPUT="${JAILED}Installing test-1...

pre-install
- 
${JAILED}Extracting test-1... done
+ 
${JAILED}Extracting test-1:  done

post-install

"

	cat test-1.txz | atf_check \
modified tests/frontend/conflicts-multirepo.shin
@@ -119,13 +119,13 @@ EOF
		pkg create -M manifest4 -o repo2/



	atf_check \
- 
		-o inline:"Creating repository in repo1... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in repo1:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo repo1



	atf_check \
- 
		-o inline:"Creating repository in repo2... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in repo2:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo repo2
@@ -142,18 +142,18 @@ local2: {
EOF



OUTPUT="Updating local1 repository catalogue...
- 
${JAILED}Fetching meta.txz... done
- 
${JAILED}Fetching packagesite.txz... done
- 
Processing entries... done
+ 
${JAILED}Fetching meta.txz:  done
+ 
${JAILED}Fetching packagesite.txz:  done
+ 
Processing entries:  done

local1 repository update completed. 2 packages processed.

Updating local2 repository catalogue...
- 
${JAILED}Fetching meta.txz... done
- 
${JAILED}Fetching packagesite.txz... done
- 
Processing entries... done
+ 
${JAILED}Fetching meta.txz:  done
+ 
${JAILED}Fetching packagesite.txz:  done
+ 
Processing entries:  done

local2 repository update completed. 2 packages processed.
- 
Updating database digests format... done
- 
Checking for upgrades (2 candidates)... done
- 
Processing candidates (2 candidates)... done
+ 
Updating database digests format:  done
+ 
Checking for upgrades (2 candidates):  done
+ 
Processing candidates (2 candidates):  done

Checking integrity... done (1 conflicting)

Checking integrity... done (0 conflicting)

The following 2 package(s) will be affected (of 0 checked):
@@ -162,9 +162,9 @@ Installed packages to be UPGRADED:
	test2: 1 -> 1.1 [local2]

	test: 1 -> 1.1 [local2]

${JAILED}[1/2] Upgrading test2 from 1 to 1.1...
- 
${JAILED}[1/2] Extracting test2-1.1... done
+ 
${JAILED}[1/2] Extracting test2-1.1:  done

${JAILED}[2/2] Upgrading test from 1 to 1.1...
- 
${JAILED}[2/2] Extracting test-1.1... done
+ 
${JAILED}[2/2] Extracting test-1.1:  done

"

	atf_check \

		-o inline:"${OUTPUT}" \
modified tests/frontend/conflicts.shin
@@ -54,7 +54,7 @@ EOF
		pkg create -M manifest2 -o .



	atf_check \
- 
		-o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo .
@@ -67,11 +67,11 @@ local: {
EOF



OUTPUT="Updating local repository catalogue...
- 
${JAILED}Fetching meta.txz... done
- 
${JAILED}Fetching packagesite.txz... done
- 
Processing entries... done
+ 
${JAILED}Fetching meta.txz:  done
+ 
${JAILED}Fetching packagesite.txz:  done
+ 
Processing entries:  done

local repository update completed. 1 packages processed.
- 
Updating database digests format... done
+ 
Updating database digests format:  done

Checking integrity... done (1 conflicting)

Checking integrity... done (0 conflicting)

The following 2 package(s) will be affected (of 0 checked):
@@ -82,9 +82,9 @@ Installed packages to be REMOVED:
New packages to be INSTALLED:

	test2: 1

${JAILED}[1/2] Deinstalling test-1...
- 
${JAILED}[1/2] Deleting files for test-1... done
+ 
${JAILED}[1/2] Deleting files for test-1:  done

${JAILED}[2/2] Installing test2-1...
- 
${JAILED}[2/2] Extracting test2-1... done
+ 
${JAILED}[2/2] Extracting test2-1:  done

"

	atf_check \

		-o inline:"${OUTPUT}" \
modified tests/frontend/packagesplit.shin
@@ -122,7 +122,7 @@ EOF
	done



	atf_check \
- 
	    -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
	    -o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

	    -e empty \

	    -s exit:0 \

	    pkg repo .
modified tests/frontend/php-pr.shin
@@ -98,7 +98,7 @@ EOF
	done



	atf_check \
- 
		-o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo .
@@ -221,7 +221,7 @@ EOF
	done



	atf_check \
- 
		-o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo .
@@ -240,9 +240,9 @@ php53-gd-5.3.27
"



OUTPUT="Updating local repository catalogue...
- 
${JAILED}Fetching meta.txz... done
- 
${JAILED}Fetching packagesite.txz... done
- 
Processing entries... done
+ 
${JAILED}Fetching meta.txz:  done
+ 
${JAILED}Fetching packagesite.txz:  done
+ 
Processing entries:  done

local repository update completed. 4 packages processed.

Checking integrity... done (0 conflicting)

The following 4 package(s) will be affected (of 0 checked):
@@ -268,8 +268,8 @@ Installed packages to be REINSTALLED:
OUTPUT="Updating local repository catalogue...

local repository is up-to-date.

All repositories are up-to-date.
- 
Checking for upgrades (3 candidates)... done
- 
Processing candidates (3 candidates)... done
+ 
Checking for upgrades (3 candidates):  done
+ 
Processing candidates (3 candidates):  done

Checking integrity... done (0 conflicting)

The following 3 package(s) will be affected (of 0 checked):
modified tests/frontend/repo.shin
@@ -35,7 +35,7 @@ EOF
		pkg create -M test.ucl



	atf_check \
- 
		-o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo .
@@ -43,7 +43,7 @@ EOF
	ln -s test-1.txz test.txz



	atf_check \
- 
		-o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo .
@@ -59,7 +59,7 @@ EOF
	ln -s test-1.txz Latest/test.txz



	atf_check \
- 
		-o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

		-e empty \

		-s exit:0 \

		pkg repo .
modified tests/frontend/requires.shin
@@ -57,9 +57,9 @@ EOF
	    pkg repo .



	OUTPUT="Updating local1 repository catalogue...
- 
${JAILED}Fetching meta.txz... done
- 
${JAILED}Fetching packagesite.txz... done
- 
Processing entries... done
+ 
${JAILED}Fetching meta.txz:  done
+ 
${JAILED}Fetching packagesite.txz:  done
+ 
Processing entries:  done

local1 repository update completed. 2 packages processed.

Checking integrity... done (0 conflicting)

The following 2 package(s) will be affected (of 0 checked):
modified tests/frontend/rubypuppet.shin
@@ -161,7 +161,7 @@ EOF
	done



	atf_check \
- 
	    -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
	    -o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

	    -e empty \

	    -s exit:0 \

	    pkg repo .
@@ -314,7 +314,7 @@ EOF
	done



	atf_check \
- 
	    -o inline:"Creating repository in .... done\nPacking files for repository... done\n" \
+ 
	    -o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

	    -e empty \

	    -s exit:0 \

	    pkg repo .
@@ -327,12 +327,12 @@ local: {
EOF



	OUTPUT="Updating local repository catalogue...
- 
${JAILED}Fetching meta.txz... done
- 
${JAILED}Fetching packagesite.txz... done
- 
Processing entries... done
+ 
${JAILED}Fetching meta.txz:  done
+ 
${JAILED}Fetching packagesite.txz:  done
+ 
Processing entries:  done

local repository update completed. 5 packages processed.
- 
Checking for upgrades (4 candidates)... done
- 
Processing candidates (4 candidates)... done
+ 
Checking for upgrades (4 candidates):  done
+ 
Processing candidates (4 candidates):  done

Checking integrity... done (1 conflicting)

Checking integrity... done (0 conflicting)

The following 6 package(s) will be affected (of 0 checked):