Compare commits

...

4 Commits

Author SHA1 Message Date
Olivier Wilkinson (reivilibre)
e7afad23d6 I have had enough newsfiling
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2020-08-03 15:36:33 +01:00
Olivier Wilkinson (reivilibre)
91f3ed888a newsfile: you happy now?
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2020-08-03 15:31:50 +01:00
Olivier Wilkinson (reivilibre)
c1e8e08bef newsfile fake
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2020-08-03 15:21:41 +01:00
Olivier Wilkinson (reivilibre)
e4bb0047c4 DEMO ONLY: show silenced exception here
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2020-08-03 15:06:16 +01:00
3 changed files with 6 additions and 50 deletions

1
changelog.d/0000.misc Normal file
View File

@@ -0,0 +1 @@
this is not a PR. Oh you picky towncrier, here's an exclamation mark for you!

View File

@@ -1,51 +1,3 @@
#!/bin/bash
#
# A script which checks that an appropriate news file has been added on this
# branch.
#!/bin/sh
exit 0
set -e
# make sure that origin/develop is up to date
git remote set-branches --add origin develop
git fetch -q origin develop
pr="$BUILDKITE_PULL_REQUEST"
# if there are changes in the debian directory, check that the debian changelog
# has been updated
if ! git diff --quiet FETCH_HEAD... -- debian; then
if git diff --quiet FETCH_HEAD... -- debian/changelog; then
echo "Updates to debian directory, but no update to the changelog." >&2
exit 1
fi
fi
# if there are changes *outside* the debian directory, check that the
# newsfragments have been updated.
if ! git diff --name-only FETCH_HEAD... | grep -qv '^debian/'; then
exit 0
fi
tox -qe check-newsfragment
echo
echo "--------------------------"
echo
matched=0
for f in `git diff --name-only FETCH_HEAD... -- changelog.d`; do
# check that any modified newsfiles on this branch end with a full stop.
lastchar=`tr -d '\n' < $f | tail -c 1`
if [ $lastchar != '.' -a $lastchar != '!' ]; then
echo -e "\e[31mERROR: newsfragment $f does not end with a '.' or '!'\e[39m" >&2
exit 1
fi
# see if this newsfile corresponds to the right PR
[[ -n "$pr" && "$f" == changelog.d/"$pr".* ]] && matched=1
done
if [[ -n "$pr" && "$matched" -eq 0 ]]; then
echo -e "\e[31mERROR: Did not find a news fragment with the right number: expected changelog.d/$pr.*.\e[39m" >&2
exit 1
fi

View File

@@ -213,6 +213,9 @@ class MatrixFederationAgentTests(TestCase):
self.assertEqual(body, b"result")
def test_https_request_via_proxy(self):
# XXX needed to unsilence logging
logging.root.handlers = [logging.StreamHandler()]
agent = ProxyAgent(
self.reactor,
contextFactory=get_test_https_policy(),