[Git][ftp-team/dak][master] 4 commits: Update .gitignore to exclude more artifacts

[Ansgar <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

• 77ab2a54
  by Niels Thykier at 2019-04-14T07:50:10Z

  Update .gitignore to exclude more artifacts
  
  This will make .gitignore exclude *most* of the artifacts from the
  tests fixtures package builds.  It still leaves package build and
  staging directories behind (e.g. debian/<pkg>/) because I had no good
  way of telling them apart from a "wanted" subdirectory.
  
  Signed-off-by: Niels Thykier <niels@thykier.net>
  

• f95130fb
  by Niels Thykier at 2019-04-14T07:55:55Z

  Add coverage to dak-setup and the dbtests
  
  Signed-off-by: Niels Thykier <niels@thykier.net>
  

• 26a67293
  by Niels Thykier at 2019-04-14T07:59:07Z

  TODO: dak now has a test suite

• 46cb2f6f
  by Ansgar Burchardt at 2019-04-14T10:10:39Z

  Merge remote-tracking branches 'nthykier/update-gitignore', 'nthykier/cover-all-the-things' and 'nthykier/patch-1'
  

4 changed files:

• .gitignore
• docs/TODO
• setup/dak-setup.sh
• tests/run-dbtests

Changes:

.gitignore

---

1	1	*.pyc
2	2	*~
3	3	.coverage
	4	+.coverage.*.*
	5	+.idea
	6	+.cache
4	7	cover/
5	8	web/epydoc/
6	9	web/d-i
...	...	@@ -27,3 +30,11 @@ web/transitions.yaml
27	30	web/cruft-report-daily.txt
28	31	web/pseudo-packages.*
29	32	web/licenses/
	33	+
	34	+tests/fixtures/packages/*.buildinfo
	35	+tests/fixtures/packages/*.tar.*
	36	+tests/fixtures/packages/*.deb
	37	+tests/fixtures/packages/*.dsc
	38	+tests/fixtures/packages/**/.debhelper
	39	+tests/fixtures/packages/**/*.debhelper.log
	40	+tests/fixtures/packages/**/*.substvars

docs/TODO

---

...	...	@@ -17,8 +17,6 @@ Various
17	17
18	18	* Check TODO.old and move still-valid/useful entries over here.
19	19
20		-* need a testsuite _badly_
21		-
22	20	* database table "binaries" contains a column 'type TEXT NOT
23	21	NULL'. This should be made a FK on override_type, as it only contains
24	22	deb/udeb strings.

setup/dak-setup.sh

---

...	...	@@ -29,10 +29,16 @@ dak-setup() {
29	29	PG_CMD="sudo -E -u postgres"
30	30	SYS_CMD="sudo -E"
31	31	USER_CMD="sudo -E -u dak -s -H"
	32	+ PYTHON_COVERAGE=
32	33	else
33	34	PG_CMD=""
34	35	SYS_CMD=""
35	36	USER_CMD=""
	37	+ if [ "$RUN_COVERAGE" = "y" ]; then
	38	+ PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
	39	+ else
	40	+ PYTHON_COVERAGE=
	41	+ fi
36	42	fi
37	43
38	44	# Get default values from init_vars.
...	...	@@ -83,9 +89,9 @@ dak-setup() {
83	89	fi
84	90
85	91	# Update the database schema
86		- $USER_CMD ${DAK_ROOT}/dak/dak.py update-db --yes
	92	+ $USER_CMD $PYTHON_COVERAGE ${DAK_ROOT}/dak/dak.py update-db --yes
87	93	# Run dak init-dirs to set up the initial /srv/dak tree
88		- $USER_CMD ${DAK_ROOT}/dak/dak.py init-dirs
	94	+ $USER_CMD $PYTHON_COVERAGE ${DAK_ROOT}/dak/dak.py init-dirs
89	95	}
90	96
91	97	dak-setup

tests/run-dbtests

---

...	...	@@ -16,10 +16,16 @@ if [[ ! -v DAK_INTEGRATION_TEST ]]; then
16	16	SYS_CMD="sudo"
17	17	KEEP_ENV_OPT="-E"
18	18	USER_CMD="sudo -u dak PGDATABASE=${PGDATABASE} DAKBASE=${DAKBASE}"
	19	+ PYTHON_COVERAGE=
19	20	else
20	21	SYS_CMD=""
21	22	KEEP_ENV_OPT=""
22	23	USER_CMD=""
	24	+ if [ "$RUN_COVERAGE" = "y" ]; then
	25	+ PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
	26	+ else
	27	+ PYTHON_COVERAGE=
	28	+ fi
23	29	fi
24	30
25	31	test-setup() {
...	...	@@ -43,4 +49,4 @@ if [[ "$1" != "--nocleanup" ]]; then
43	49	fi
44	50
45	51	test-setup
46		-$USER_CMD ${DAK_ROOT}/tests/dbtest_all.py
	52	+$USER_CMD $PYTHON_COVERAGE ${DAK_ROOT}/tests/dbtest_all.py

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.