Commit f51ce210 authored by ChangZhuo Chen's avatar ChangZhuo Chen

merge patched into master

parents ccdef0f8 f0e90f2f
# see git-dpm(1) from git-dpm package
72f60cadb98011b937a169422dfe7cbdbc27d931
72f60cadb98011b937a169422dfe7cbdbc27d931
f0e90f2f6347869191ff828e960f11213bf3d685
f0e90f2f6347869191ff828e960f11213bf3d685
72f60cadb98011b937a169422dfe7cbdbc27d931
72f60cadb98011b937a169422dfe7cbdbc27d931
sphinx-argparse_0.2.1.orig.tar.gz
......
From f0e90f2f6347869191ff828e960f11213bf3d685 Mon Sep 17 00:00:00 2001
From: Daniel Stender <debian@danielstender.com>
Date: Wed, 20 Jan 2016 21:24:54 +0100
Subject: fix-tests
fix tests for running py.test via Python interpreter
Forwarded: not-needed
---
test/test_parser.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/test_parser.py b/test/test_parser.py
index 075888b..499204b 100755
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -157,8 +157,8 @@ def test_parse_nested():
{
'name': 'install',
'help': 'install help',
- 'usage': 'usage: py.test install [-h] [--upgrade] ref',
- 'bare_usage': 'py.test install [-h] [--upgrade] ref',
+ 'usage': 'usage: pytest.py install [-h] [--upgrade] ref',
+ 'bare_usage': 'py.test.py install [-h] [--upgrade] ref',
'action_groups': [
{
'title': 'Positional Arguments',
@@ -223,8 +223,8 @@ def test_parse_nested_traversal():
{
'name': 'level3',
'help': '',
- 'usage': 'usage: py.test level1 level2 level3 [-h] foo bar',
- 'bare_usage': 'py.test level1 level2 level3 [-h] foo bar',
+ 'usage': 'usage: pytest.py level1 level2 level3 [-h] foo bar',
+ 'bare_usage': 'pytest.py level1 level2 level3 [-h] foo bar',
'action_groups': [
{
'title': 'Positional Arguments',
0001-fix-tests.patch
......@@ -157,8 +157,8 @@ def test_parse_nested():
{
'name': 'install',
'help': 'install help',
'usage': 'usage: py.test install [-h] [--upgrade] ref',
'bare_usage': 'py.test install [-h] [--upgrade] ref',
'usage': 'usage: pytest.py install [-h] [--upgrade] ref',
'bare_usage': 'py.test.py install [-h] [--upgrade] ref',
'action_groups': [
{
'title': 'Positional Arguments',
......@@ -223,8 +223,8 @@ def test_parse_nested_traversal():
{
'name': 'level3',
'help': '',
'usage': 'usage: py.test level1 level2 level3 [-h] foo bar',
'bare_usage': 'py.test level1 level2 level3 [-h] foo bar',
'usage': 'usage: pytest.py level1 level2 level3 [-h] foo bar',
'bare_usage': 'pytest.py level1 level2 level3 [-h] foo bar',
'action_groups': [
{
'title': 'Positional Arguments',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment