aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2019-02-03 20:03:25 +0300
committerIgor Pashev <pashev.igor@gmail.com>2019-02-03 20:04:18 +0300
commite9839120f02e279effbeda9d4d2d4b5f81f0a300 (patch)
treefc8976135bdb6066031a313da9f8db8d2e719dc9
parent20f9bf532300f44561097f575cf7b3bb40533e95 (diff)
downloadnixsap-e9839120f02e279effbeda9d4d2d4b5f81f0a300.tar.gz
Add pyresttest 1.7.1+ (from github)
With UNIX socker support: https://github.com/svanoort/pyresttest/pull/300
-rw-r--r--pkgs/pyresttest/add-unix-socket.patch57
-rw-r--r--pkgs/pyresttest/default.nix22
2 files changed, 79 insertions, 0 deletions
diff --git a/pkgs/pyresttest/add-unix-socket.patch b/pkgs/pyresttest/add-unix-socket.patch
new file mode 100644
index 0000000..d55a9b9
--- /dev/null
+++ b/pkgs/pyresttest/add-unix-socket.patch
@@ -0,0 +1,57 @@
+From 95364551209815ca2c2380ce270474989b924dda Mon Sep 17 00:00:00 2001
+From: Igor Pashev <pashev.igor@gmail.com>
+Date: Sat, 26 Jan 2019 11:48:48 +0200
+Subject: [PATCH] Add --unix-socket option
+
+---
+ pyresttest/resttest.py | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/pyresttest/resttest.py b/pyresttest/resttest.py
+index 0344746..845c438 100644
+--- a/pyresttest/resttest.py
++++ b/pyresttest/resttest.py
+@@ -111,6 +111,7 @@ class TestConfig:
+ verbose = False
+ ssl_insecure = False
+ skip_term_colors = False # Turn off output term colors
++ unix_socket = None
+
+ # Binding and creation of generators
+ variable_binds = None
+@@ -331,6 +332,8 @@ def run_test(mytest, test_config=TestConfig(), context=None, curl_handle=None, *
+ if test_config.ssl_insecure:
+ curl.setopt(pycurl.SSL_VERIFYPEER, 0)
+ curl.setopt(pycurl.SSL_VERIFYHOST, 0)
++ if test_config.unix_socket != None:
++ curl.setopt(pycurl.UNIX_SOCKET_PATH, test_config.unix_socket)
+
+ result.passed = None
+
+@@ -798,6 +801,7 @@ def main(args):
+ Keys allowed for args:
+ url - REQUIRED - Base URL
+ test - REQUIRED - Test file (yaml)
++ unix_socket - OPTIONAL - connect to this UNIX socket
+ print_bodies - OPTIONAL - print response body
+ print_headers - OPTIONAL - print response headers
+ log - OPTIONAL - set logging level {debug,info,warning,error,critical} (default=warning)
+@@ -854,6 +858,9 @@ def main(args):
+ if 'ssl_insecure' in args and args['ssl_insecure'] is not None:
+ t.config.ssl_insecure = safe_to_bool(args['ssl_insecure'])
+
++ if 'unix_socket' in args and args['unix_socket'] is not None:
++ t.config.unix_socket = args['unix_socket']
++
+ if 'skip_term_colors' in args and args['skip_term_colors'] is not None:
+ t.config.skip_term_colors = safe_to_bool(args['skip_term_colors'])
+
+@@ -877,6 +884,8 @@ def parse_command_line_args(args_in):
+ action="store", type="string")
+ parser.add_option(
+ u"--url", help="Base URL to run tests against", action="store", type="string")
++ parser.add_option(u"--unix-socket", help="Connect to this UNIX socket",
++ action="store", type="string", dest="unix_socket")
+ parser.add_option(u"--test", help="Test file to use",
+ action="store", type="string")
+ parser.add_option(u'--import_extensions',
diff --git a/pkgs/pyresttest/default.nix b/pkgs/pyresttest/default.nix
new file mode 100644
index 0000000..dca0774
--- /dev/null
+++ b/pkgs/pyresttest/default.nix
@@ -0,0 +1,22 @@
+{ fetchgit, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "pyresttest";
+ version = "1.7.1+git";
+
+ src = fetchgit {
+ url = "https://github.com/svanoort/pyresttest.git";
+ rev = "f92acf8e838c4623ddd8e12e880f31046ff9317f";
+ sha256 = "0zwizn57x7grvwrvz4ahdrabkgiadyffgf4sqnhdacpczxpry57r";
+ };
+
+ patches = [
+ ./add-unix-socket.patch
+ ];
+
+ propagatedBuildInputs = with python3Packages; [
+ future jmespath pycurl pyyaml
+ ];
+
+ doCheck = false;
+}