From 5947daaba31d5f88c1d6200ed35a6683e55c241d Mon Sep 17 00:00:00 2001 From: "Schreiner, Henry F" Date: Wed, 18 Nov 2015 12:10:14 -0600 Subject: [PATCH] Added skip for OrderedDict on Py26 --- .coveragerc | 2 +- tests/test_terminal.py | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index daa6da45..2344c3eb 100644 --- a/.coveragerc +++ b/.coveragerc @@ -4,7 +4,7 @@ source = plumbum omit = *ipython*.py - __main__.py + *__main__.py [report] exclude_lines = diff --git a/tests/test_terminal.py b/tests/test_terminal.py index 4baca38a..138bcadc 100644 --- a/tests/test_terminal.py +++ b/tests/test_terminal.py @@ -2,11 +2,20 @@ import sys import time from contextlib import contextmanager -from collections import OrderedDict from plumbum.cli.terminal import ask, choose, prompt, hexdump, Progress from plumbum.lib import StringIO +try: + from collections import OrderedDict +except ImportError: + try: + from ordereddict import OrderedDict + except ImportError: + OrderedDict = None +needs_od = pytest.mark.skipif(OrderedDict is None, + reason="Ordered dict not available (Py 2.6)") + @contextmanager def send_stdin(stdin = "\n"): prevstdin = sys.stdin @@ -75,6 +84,8 @@ def test_choose_dict(self): value = choose("Pick", dict(one="a",two="b")) assert value in ("a","b") + @needs_od + def test_ordered_dict(self): dic = OrderedDict() dic["one"] = "a" dic["two"] = "b" @@ -85,6 +96,7 @@ def test_choose_dict(self): value = choose("Pick", dic) assert value == "b" + @needs_od def test_choose_dict_default(self, capsys): dic = OrderedDict() dic["one"] = "a"