From 9210c80985d0ce860121211aa451255caf86eb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boros?= Date: Mon, 2 Sep 2019 06:47:38 +0200 Subject: [PATCH 1/2] Add markers for pytest --- pytest.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pytest.ini b/pytest.ini index 0ee949b8..a2ae04b7 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,6 @@ [pytest] python_files = test_*.py +markers = + unit: Run unit tests + integration: Run integration tests + asyncio: Run asyncio relates tests \ No newline at end of file From 040f4053dfbcb16e323b716a850557bafef226fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boros?= Date: Tue, 3 Sep 2019 07:29:03 +0200 Subject: [PATCH 2/2] Fix Dump command --- rethinkdb/_dump.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rethinkdb/_dump.py b/rethinkdb/_dump.py index eba85ea9..0160441d 100755 --- a/rethinkdb/_dump.py +++ b/rethinkdb/_dump.py @@ -18,7 +18,7 @@ # Copyright 2010-2016 RethinkDB, all rights reserved. -'''`rethinkdb dump` creates an archive of data from a RethinkDB cluster''' +'''`rethinkdb-dump` creates an archive of data from a RethinkDB cluster''' from __future__ import print_function @@ -95,7 +95,6 @@ def parse_options(argv, prog=None): options, args = parser.parse_args(argv) # Check validity of arguments - if len(args) != 0: raise parser.error("No positional arguments supported. Unrecognized option(s): %s" % args) @@ -141,7 +140,7 @@ def parse_options(argv, prog=None): def main(argv=None, prog=None): - options = parse_options(argv or sys.argv[2:], prog=prog) + options = parse_options(argv or sys.argv[1:], prog=prog) try: if not options.quiet: # Print a warning about the capabilities of dump, so no one is confused (hopefully)