[Git][ftp-team/dak][master] 3 commits: run-dbtests: Fix command not found on empty USER_CMD

[Ansgar Burchardt <ansgar@debian.org>]

Title: GitLab

Ansgar Burchardt pushed to branch master at Debian FTP Team / dak

Commits:

• 0e18b7a9
  by Niels Thykier at 2018-05-23T18:06:34+00:00

  run-dbtests: Fix command not found on empty USER_CMD
  
  Signed-off-by: Niels Thykier <niels@thykier.net>
  

• a0863ea4
  by Niels Thykier at 2018-05-23T18:06:34+00:00

  run-dbtests: Fail on error (set -e)
  
  Signed-off-by: Niels Thykier <niels@thykier.net>
  

• 48c977b8
  by Ansgar Burchardt at 2018-05-23T18:12:53+00:00

  Merge branch 'improve-run-dbtests' into 'master'
  
  Improve run dbtests
  
  See merge request ftp-team/dak!68

1 changed file:

• tests/run-dbtests

Changes:

tests/run-dbtests

---

1	1	#!/bin/bash
2	2
	3	+set -e
	4	+
3	5	# Create the database that will be used by the fixtures, populating it with the
4	6	# default data. Also create a test dak directory.
5	7
...	...	@@ -12,9 +14,11 @@ export PGDATABASE=test_projectb
12	14
13	15	if [[ ! -v DAK_INTEGRATION_TEST ]]; then
14	16	SYS_CMD="sudo"
	17	+ KEEP_ENV_OPT="-E"
15	18	USER_CMD="sudo -u dak PGDATABASE=${PGDATABASE} DAKBASE=${DAKBASE}"
16	19	else
17	20	SYS_CMD=""
	21	+ KEEP_ENV_OPT=""
18	22	USER_CMD=""
19	23	fi
20	24
...	...	@@ -26,7 +30,7 @@ test-setup() {
26	30
27	31	test-cleanup() {
28	32	echo Dropping DB ${PGDATABASE}
29		- $USER_CMD -E dropdb ${PGDATABASE}
	33	+ $USER_CMD $KEEP_ENV_OPT dropdb ${PGDATABASE}
30	34	echo Deleting temporary directory
31	35	$SYS_CMD rm -rf -- ${DAKBASE}
32	36	}

—
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.