Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5d74f50
Merge remote-tracking branch 'origin/pr/957'
Bryan Drewery committed 11 years ago
commit 5d74f5067e88984674e03eb9a25e6b91209b3d48
parent 22169ec
10 files changed +21 -28
deleted tests/Atffile
@@ -1,7 +0,0 @@
- 
Content-Type: application/X-atf-atffile; version="1"
-
- 
prop: test-suite = pkgng
-
- 
tp: frontend
- 
tp: lib
-
added tests/Kyuafile
@@ -0,0 +1,6 @@
+ 
syntax('kyuafile', 1)
+
+ 
test_suite('prop: test-suite = pkgng')
+
+ 
include('frontend/Kyuafile')
+ 
include('lib/Kyuafile')
modified tests/Makefile.am
@@ -14,4 +14,4 @@ EXTRA_PROGRAMS= $(tests_programs)
check_PROGRAMS=	@TESTS@



regression-test:
- 
	@echo "ATF/KYUA has change our testing framework is not compatible for now"
+ 
	atf-run | atf-report
deleted tests/frontend/Atffile
@@ -1,8 +0,0 @@
- 
Content-Type: application/X-atf-atffile; version="1"
-
- 
prop: test-suite = frontend
-
- 
tp: pkg.sh
- 
tp: version.sh
- 
tp: search.sh
- 
tp: annotate.sh
added tests/frontend/Kyuafile
@@ -0,0 +1,8 @@
+ 
syntax('kyuafile', 1)
+
+ 
test_suite('prop: test-suite = frontend')
+
+ 
atf_test_program{name='pkg.sh'}
+ 
atf_test_program{name='version.sh'}
+ 
atf_test_program{name='search.sh'}
+ 
atf_test_program{name='annotate.sh'}
modified tests/frontend/annotate.sh
@@ -15,7 +15,7 @@ annotate_body() {


	for pkg in 'png-1.5.14' 'sqlite3-3.7.14.1' ; do

	    atf_check \
- 
		-o match:"^Installing $pkg\.\.\." \
+ 
		-o empty \

		-e empty \

		-s exit:0 \

		pkg register -t -M $(atf_get_srcdir)/$pkg.yaml
modified tests/frontend/pkg.sh
@@ -26,7 +26,7 @@ pkg_version_body()
	

	[ ${PKGVERSION} ] || atf_fail 'eval $(newvers.sh) failed'
- 
	atf_check -o match:"^${PKGVERSION} " -e empty -s exit:0 pkg -v
+ 
	atf_check -o match:"^${PKGVERSION}" -e empty -s exit:0 pkg -v

}
modified tests/frontend/search.sh
@@ -7,7 +7,7 @@ search_head() {


search_body() {

	REPOS_DIR=/nonexistent
- 
	atf_check -e inline:"pkg: No repositories configured\n" -o empty -s exit:74 pkg -C '' -R '' search -e -Q comment -S name pkg
+ 
	atf_check -e inline:"pkg: No active remote repositories configured\n" -o empty -s exit:74 pkg -C '' -R '' search -e -Q comment -S name pkg

}



atf_init_test_cases() {
deleted tests/lib/Atffile
@@ -1,9 +0,0 @@
- 
Content-Type: application/X-atf-atffile; version="1"
-
- 
prop: test-suite = lib
-
- 
#tp: pkg
- 
#tp: manifest
- 
tp: test
- 
tp: pkg_printf_test
- 
tp: pkg_validation
added tests/lib/Kyuafile
@@ -0,0 +1,3 @@
+ 
syntax('kyuafile', 1)
+
+ 
test_suite('prop: test-suite = lib')