Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/269408
Change subject: Fix test suite's check for empty directory
......................................................................
Fix test suite's check for empty directory
On the Jenkins test server, the output of ls(1) for files not found
changed from:
| ls: cannot access does-exist/*: No such file or directory
to:
| ls: cannot access 'does-exist/*': No such file or directory
This change replaces the test with a call to find(1).
Change-Id: If9534fa5be6a1293956f08ffdcbd7ea411403260
---
M debian/changelog
M tests/testsuite.at
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs
refs/changes/08/269408/1
diff --git a/debian/changelog b/debian/changelog
index ac9d2cb..0ebc726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
toollabs (1.9~dev) unstable; urgency=medium
+ * Fix test suite's check for empty directory. [Tim Landscheidt]
* Don't call log-command-invocation when testing jsub. [Bryan Davis]
* Set versions and dates in man pages from debian/changelog. [Tim
Landscheidt]
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 4191bda..30d8634 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -124,8 +124,7 @@
_AT_TOOLLABS_JSUB([-o does-exist -quiet true], [], [Your job 501377 ("true")
has been submitted
], [], [0], [-o does-exist -e $HOME/true.err -M
${LOGNAME:-$USER}@tools.wmflabs.org -N true -hard -l h_vmem=524288k -q task -b
y /bin/true
], [], [], [], [0])
-AT_CHECK([LANG=C ls does-exist/*], [2], [], [ls: cannot access does-exist/*:
No such file or directory
-])
+AT_CHECK([find does-exist -mindepth 1], [0], [], [])
AT_CLEANUP()
AT_SETUP([.jsubrc is honoured])
--
To view, visit https://gerrit.wikimedia.org/r/269408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9534fa5be6a1293956f08ffdcbd7ea411403260
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
