From 4737a69f105d101bac811e15b5db5e0e3e59bde0 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 2 Jan 2018 17:16:52 -0600 Subject: [PATCH] Add a few additional tests, specifically around --source --- speedtest.py | 2 +- tests/scripts/source.py | 37 +++++++++++++++++++++++++++++++++++++ tox.ini | 4 ++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 tests/scripts/source.py diff --git a/speedtest.py b/speedtest.py index a6ac664..d0da04e 100755 --- a/speedtest.py +++ b/speedtest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright 2012-2016 Matt Martz +# Copyright 2012-2018 Matt Martz # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/tests/scripts/source.py b/tests/scripts/source.py new file mode 100644 index 0000000..357f4c6 --- /dev/null +++ b/tests/scripts/source.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright 2018 Matt Martz +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import sys +import subprocess + +cmd = [sys.executable, 'speedtest.py', '--source', '127.0.0.1'] + +p = subprocess.Popen( + cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE +) + +stdout, stderr = p.communicate() + +if p.returncode != 1: + raise SystemExit('%s did not fail with exit code 1' % ' '.join(cmd)) + +if 'Invalid argument'.encode() not in stderr: + raise SystemExit( + '"Invalid argument" not found in stderr:\n%s' % stderr.decode() + ) diff --git a/tox.ini b/tox.ini index 477fa1c..8a63b5b 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,8 @@ commands = {envpython} -V {envpython} -m compileall speedtest.py {envpython} speedtest.py + {envpython} speedtest.py --source 172.17.0.1 + {envpython} tests/scripts/source.py [testenv:flake8] basepython=python @@ -19,3 +21,5 @@ commands = pypy -V pypy -m compileall speedtest.py pypy speedtest.py + pypy speedtest.py --source 172.17.0.1 + pypy tests/scripts/source.py