From cd3fdca540781d0b982e885b01f467f1601dba75 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 11 Jan 2017 12:03:26 -0800 Subject: [PATCH] Switch tests to pytest and ansible-test. - Replace nose usage with pytest. - Remove legacy Shippable integration.sh. - Update Makefile to use pytest and ansible-test. - Convert most yield unit tests to pytest parametrize. --- Makefile | 18 +- hacking/README.md | 2 +- lib/ansible/test-requirements.txt | 1 + test/README.md | 2 +- test/units/module_utils/test_database.py | 179 ++++++++---------- test/units/parsing/test_splitter.py | 164 ++++++++-------- test/units/parsing/test_unquote.py | 55 +++--- .../shippable/integration-requirements.txt | 1 - test/utils/shippable/integration.sh | 140 -------------- .../shippable/python3-test-tag-blacklist.txt | 2 - .../python3-test-target-blacklist.txt | 0 test/utils/tox/requirements-py3.txt | 1 + test/utils/tox/requirements.txt | 1 + 13 files changed, 199 insertions(+), 367 deletions(-) delete mode 100644 test/utils/shippable/integration-requirements.txt delete mode 100755 test/utils/shippable/integration.sh delete mode 100644 test/utils/shippable/python3-test-tag-blacklist.txt delete mode 100644 test/utils/shippable/python3-test-target-blacklist.txt diff --git a/Makefile b/Makefile index 154b8d3eb4..d24477f66b 100644 --- a/Makefile +++ b/Makefile @@ -98,22 +98,30 @@ RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)" MOCK_BIN ?= mock MOCK_CFG ?= -NOSETESTS ?= nosetests +# ansible-test parameters +ANSIBLE_TEST ?= test/runner/ansible-test +TEST_FLAGS ?= -NOSETESTS3 ?= nosetests-3.5 +# ansible-test units parameters (make test / make test-py3) +PYTHON_VERSION ?= $(shell python2 -c 'import sys; print("%s.%s" % sys.version_info[:2])') +PYTHON3_VERSION ?= $(shell python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') + +# ansible-test integration parameters (make integration) +IMAGE ?= centos7 +TARGET ?= ######################################################## all: clean python tests: - PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase -e test_os_server + $(ANSIBLE_TEST) units -v --python $(PYTHON_VERSION) $(TEST_FLAGS) tests-py3: - PYTHONPATH=./lib $(NOSETESTS3) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase -e test_os_server + $(ANSIBLE_TEST) units -v --python $(PYTHON3_VERSION) $(TEST_FLAGS) integration: - test/utils/shippable/integration.sh + $(ANSIBLE_TEST) integration -v --docker $(IMAGE) $(TARGET) $(TEST_FLAGS) authors: sh hacking/authors.sh diff --git a/hacking/README.md b/hacking/README.md index 1bd6d468a8..b65bcd0b66 100644 --- a/hacking/README.md +++ b/hacking/README.md @@ -17,7 +17,7 @@ and do not wish to install them from your operating system package manager, you can install them from pip $ easy_install pip # if pip is not already available - $ pip install pyyaml jinja2 nose passlib pycrypto + $ pip install pyyaml jinja2 nose pytest passlib pycrypto From there, follow ansible instructions on docs.ansible.com as normal. diff --git a/lib/ansible/test-requirements.txt b/lib/ansible/test-requirements.txt index e4822ada64..29b0ca7a6f 100644 --- a/lib/ansible/test-requirements.txt +++ b/lib/ansible/test-requirements.txt @@ -14,3 +14,4 @@ six unittest2 mock nose +pytest diff --git a/test/README.md b/test/README.md index 3ae6c61382..8e564a0a0c 100644 --- a/test/README.md +++ b/test/README.md @@ -12,7 +12,7 @@ mock interfaces rather than producing side effects. Playbook engine code is better suited for integration tests. -Requirements: `sudo pip install paramiko PyYAML jinja2 httplib2 passlib nose mock` +Requirements: `sudo pip install paramiko PyYAML jinja2 httplib2 passlib nose pytest mock` integration ----------- diff --git a/test/units/module_utils/test_database.py b/test/units/module_utils/test_database.py index bb9cb8b9d9..675aed547a 100644 --- a/test/units/module_utils/test_database.py +++ b/test/units/module_utils/test_database.py @@ -1,121 +1,100 @@ -import collections -import os -import re - - -from nose.tools import eq_ -try: - from nose.tools import assert_raises_regexp -except ImportError: - from ansible.compat.six import string_types - # Python < 2.7 - def assert_raises_regexp(expected, regexp, callable, *a, **kw): - try: - callable(*a, **kw) - except expected as e: - if isinstance(regexp, string_types): - regexp = re.compile(regexp) - if not regexp.search(str(e)): - raise Exception('"%s" does not match "%s"' % - (regexp.pattern, str(e))) - else: - if hasattr(expected,'__name__'): excName = expected.__name__ - else: excName = str(expected) - raise AssertionError("%s not raised" % excName) - -from ansible.compat.tests import mock +import pytest from ansible.module_utils.database import ( pg_quote_identifier, SQLParseError, ) +# These are all valid strings +# The results are based on interpreting the identifier as a table name +VALID = { + # User quoted + '"public.table"': '"public.table"', + '"public"."table"': '"public"."table"', + '"schema test"."table test"': '"schema test"."table test"', -# Note: Using nose's generator test cases here so we can't inherit from -# unittest.TestCase -class TestQuotePgIdentifier(object): + # We quote part + 'public.table': '"public"."table"', + '"public".table': '"public"."table"', + 'public."table"': '"public"."table"', + 'schema test.table test': '"schema test"."table test"', + '"schema test".table test': '"schema test"."table test"', + 'schema test."table test"': '"schema test"."table test"', - # These are all valid strings - # The results are based on interpreting the identifier as a table name - valid = { - # User quoted - '"public.table"': '"public.table"', - '"public"."table"': '"public"."table"', - '"schema test"."table test"': '"schema test"."table test"', + # Embedded double quotes + 'table "test"': '"table ""test"""', + 'public."table ""test"""': '"public"."table ""test"""', + 'public.table "test"': '"public"."table ""test"""', + 'schema "test".table': '"schema ""test"""."table"', + '"schema ""test""".table': '"schema ""test"""."table"', + '"""wat"""."""test"""': '"""wat"""."""test"""', + # Sigh, handle these as well: + '"no end quote': '"""no end quote"', + 'schema."table': '"schema"."""table"', + '"schema.table': '"""schema"."table"', + 'schema."table.something': '"schema"."""table"."something"', - # We quote part - 'public.table': '"public"."table"', - '"public".table': '"public"."table"', - 'public."table"': '"public"."table"', - 'schema test.table test': '"schema test"."table test"', - '"schema test".table test': '"schema test"."table test"', - 'schema test."table test"': '"schema test"."table test"', + # Embedded dots + '"schema.test"."table.test"': '"schema.test"."table.test"', + '"schema.".table': '"schema."."table"', + '"schema."."table"': '"schema."."table"', + 'schema.".table"': '"schema".".table"', + '"schema".".table"': '"schema".".table"', + '"schema.".".table"': '"schema.".".table"', + # These are valid but maybe not what the user intended + '."table"': '".""table"""', + 'table.': '"table."', +} - # Embedded double quotes - 'table "test"': '"table ""test"""', - 'public."table ""test"""': '"public"."table ""test"""', - 'public.table "test"': '"public"."table ""test"""', - 'schema "test".table': '"schema ""test"""."table"', - '"schema ""test""".table': '"schema ""test"""."table"', - '"""wat"""."""test"""': '"""wat"""."""test"""', - # Sigh, handle these as well: - '"no end quote': '"""no end quote"', - 'schema."table': '"schema"."""table"', - '"schema.table': '"""schema"."table"', - 'schema."table.something': '"schema"."""table"."something"', +INVALID = { + ('test.too.many.dots', 'table'): 'PostgreSQL does not support table with more than 3 dots', + ('"test.too".many.dots', 'database'): 'PostgreSQL does not support database with more than 1 dots', + ('test.too."many.dots"', 'database'): 'PostgreSQL does not support database with more than 1 dots', + ('"test"."too"."many"."dots"', 'database'): "PostgreSQL does not support database with more than 1 dots", + ('"test"."too"."many"."dots"', 'schema'): "PostgreSQL does not support schema with more than 2 dots", + ('"test"."too"."many"."dots"', 'table'): "PostgreSQL does not support table with more than 3 dots", + ('"test"."too"."many"."dots"."for"."column"', 'column'): "PostgreSQL does not support column with more than 4 dots", + ('"table "invalid" double quote"', 'table'): 'User escaped identifiers must escape extra quotes', + ('"schema "invalid"""."table "invalid"', 'table'): 'User escaped identifiers must escape extra quotes', + ('"schema."table"', 'table'): 'User escaped identifiers must escape extra quotes', + ('"schema".', 'table'): 'Identifier name unspecified or unquoted trailing dot', +} - # Embedded dots - '"schema.test"."table.test"': '"schema.test"."table.test"', - '"schema.".table': '"schema."."table"', - '"schema."."table"': '"schema."."table"', - 'schema.".table"': '"schema".".table"', - '"schema".".table"': '"schema".".table"', - '"schema.".".table"': '"schema.".".table"', - # These are valid but maybe not what the user intended - '."table"': '".""table"""', - 'table.': '"table."', - } +HOW_MANY_DOTS = ( + ('role', 'role', '"role"', + 'PostgreSQL does not support role with more than 1 dots'), + ('db', 'database', '"db"', + 'PostgreSQL does not support database with more than 1 dots'), + ('db.schema', 'schema', '"db"."schema"', + 'PostgreSQL does not support schema with more than 2 dots'), + ('db.schema.table', 'table', '"db"."schema"."table"', + 'PostgreSQL does not support table with more than 3 dots'), + ('db.schema.table.column', 'column', '"db"."schema"."table"."column"', + 'PostgreSQL does not support column with more than 4 dots'), +) - invalid = { - ('test.too.many.dots', 'table'): 'PostgreSQL does not support table with more than 3 dots', - ('"test.too".many.dots', 'database'): 'PostgreSQL does not support database with more than 1 dots', - ('test.too."many.dots"', 'database'): 'PostgreSQL does not support database with more than 1 dots', - ('"test"."too"."many"."dots"', 'database'): "PostgreSQL does not support database with more than 1 dots", - ('"test"."too"."many"."dots"', 'schema'): "PostgreSQL does not support schema with more than 2 dots", - ('"test"."too"."many"."dots"', 'table'): "PostgreSQL does not support table with more than 3 dots", - ('"test"."too"."many"."dots"."for"."column"', 'column'): "PostgreSQL does not support column with more than 4 dots", - ('"table "invalid" double quote"', 'table'): 'User escaped identifiers must escape extra quotes', - ('"schema "invalid"""."table "invalid"', 'table'): 'User escaped identifiers must escape extra quotes', - ('"schema."table"','table'): 'User escaped identifiers must escape extra quotes', - ('"schema".', 'table'): 'Identifier name unspecified or unquoted trailing dot', - } +VALID_QUOTES = ((test, VALID[test]) for test in VALID) +INVALID_QUOTES = ((test[0], test[1], INVALID[test]) for test in INVALID) - def check_valid_quotes(self, identifier, quoted_identifier): - eq_(pg_quote_identifier(identifier, 'table'), quoted_identifier) - def test_valid_quotes(self): - for identifier in self.valid: - yield self.check_valid_quotes, identifier, self.valid[identifier] +@pytest.mark.parametrize("identifier, quoted_identifier", VALID_QUOTES) +def test_valid_quotes(identifier, quoted_identifier): + assert pg_quote_identifier(identifier, 'table') == quoted_identifier - def check_invalid_quotes(self, identifier, id_type, msg): - assert_raises_regexp(SQLParseError, msg, pg_quote_identifier, *(identifier, id_type)) - def test_invalid_quotes(self): - for test in self.invalid: - yield self.check_invalid_quotes, test[0], test[1], self.invalid[test] +@pytest.mark.parametrize("identifier, id_type, msg", INVALID_QUOTES) +def test_invalid_quotes(identifier, id_type, msg): + with pytest.raises(SQLParseError) as ex: + pg_quote_identifier(identifier, id_type) - def test_how_many_dots(self): - eq_(pg_quote_identifier('role', 'role'), '"role"') - assert_raises_regexp(SQLParseError, "PostgreSQL does not support role with more than 1 dots", pg_quote_identifier, *('role.more', 'role')) + ex.match(msg) - eq_(pg_quote_identifier('db', 'database'), '"db"') - assert_raises_regexp(SQLParseError, "PostgreSQL does not support database with more than 1 dots", pg_quote_identifier, *('db.more', 'database')) - eq_(pg_quote_identifier('db.schema', 'schema'), '"db"."schema"') - assert_raises_regexp(SQLParseError, "PostgreSQL does not support schema with more than 2 dots", pg_quote_identifier, *('db.schema.more', 'schema')) +@pytest.mark.parametrize("identifier, id_type, quoted_identifier, msg", HOW_MANY_DOTS) +def test_how_many_dots(identifier, id_type, quoted_identifier, msg): + assert pg_quote_identifier(identifier, id_type) == quoted_identifier - eq_(pg_quote_identifier('db.schema.table', 'table'), '"db"."schema"."table"') - assert_raises_regexp(SQLParseError, "PostgreSQL does not support table with more than 3 dots", pg_quote_identifier, *('db.schema.table.more', 'table')) + with pytest.raises(SQLParseError) as ex: + pg_quote_identifier('%s.more' % identifier, id_type) - eq_(pg_quote_identifier('db.schema.table.column', 'column'), '"db"."schema"."table"."column"') - assert_raises_regexp(SQLParseError, "PostgreSQL does not support column with more than 4 dots", pg_quote_identifier, *('db.schema.table.column.more', 'column')) + ex.match(msg) diff --git a/test/units/parsing/test_splitter.py b/test/units/parsing/test_splitter.py index 979a585979..d820117291 100644 --- a/test/units/parsing/test_splitter.py +++ b/test/units/parsing/test_splitter.py @@ -20,96 +20,88 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from nose import tools -from ansible.compat.tests import unittest - from ansible.parsing.splitter import split_args, parse_kv +import pytest -# Tests using nose's test generators cannot use unittest base class. -# http://nose.readthedocs.org/en/latest/writing_tests.html#test-generators -class TestSplitter_Gen: - SPLIT_DATA = ( - (u'a', - [u'a'], - {u'_raw_params': u'a'}), - (u'a=b', - [u'a=b'], - {u'a': u'b'}), - (u'a="foo bar"', - [u'a="foo bar"'], - {u'a': u'foo bar'}), - (u'"foo bar baz"', - [u'"foo bar baz"'], - {u'_raw_params': '"foo bar baz"'}), - (u'foo bar baz', - [u'foo', u'bar', u'baz'], - {u'_raw_params': u'foo bar baz'}), - (u'a=b c="foo bar"', - [u'a=b', u'c="foo bar"'], - {u'a': u'b', u'c': u'foo bar'}), - (u'a="echo \\"hello world\\"" b=bar', - [u'a="echo \\"hello world\\""', u'b=bar'], - {u'a': u'echo "hello world"', u'b': u'bar'}), - (u'a="multi\nline"', - [u'a="multi\nline"'], - {u'a': u'multi\nline'}), - (u'a="blank\n\nline"', - [u'a="blank\n\nline"'], - {u'a': u'blank\n\nline'}), - (u'a="blank\n\n\nlines"', - [u'a="blank\n\n\nlines"'], - {u'a': u'blank\n\n\nlines'}), - (u'a="a long\nmessage\\\nabout a thing\n"', - [u'a="a long\nmessage\\\nabout a thing\n"'], - {u'a': u'a long\nmessage\\\nabout a thing\n'}), - (u'a="multiline\nmessage1\\\n" b="multiline\nmessage2\\\n"', - [u'a="multiline\nmessage1\\\n"', u'b="multiline\nmessage2\\\n"'], - {u'a': 'multiline\nmessage1\\\n', u'b': u'multiline\nmessage2\\\n'}), - (u'a={{jinja}}', - [u'a={{jinja}}'], - {u'a': u'{{jinja}}'}), - (u'a={{ jinja }}', - [u'a={{ jinja }}'], - {u'a': u'{{ jinja }}'}), - (u'a="{{jinja}}"', - [u'a="{{jinja}}"'], - {u'a': u'{{jinja}}'}), - (u'a={{ jinja }}{{jinja2}}', - [u'a={{ jinja }}{{jinja2}}'], - {u'a': u'{{ jinja }}{{jinja2}}'}), - (u'a="{{ jinja }}{{jinja2}}"', - [u'a="{{ jinja }}{{jinja2}}"'], - {u'a': u'{{ jinja }}{{jinja2}}'}), - (u'a={{jinja}} b={{jinja2}}', - [u'a={{jinja}}', u'b={{jinja2}}'], - {u'a': u'{{jinja}}', u'b': u'{{jinja2}}'}), - (u'a="{{jinja}}\n" b="{{jinja2}}\n"', - [u'a="{{jinja}}\n"', u'b="{{jinja2}}\n"'], - {u'a': u'{{jinja}}\n', u'b': u'{{jinja2}}\n'}), - (u'a="café eñyei"', - [u'a="café eñyei"'], - {u'a': u'café eñyei'}), - (u'a=café b=eñyei', - [u'a=café', u'b=eñyei'], - {u'a': u'café', u'b': u'eñyei'}), - (u'a={{ foo | some_filter(\' \', " ") }} b=bar', - [u'a={{ foo | some_filter(\' \', " ") }}', u'b=bar'], - {u'a': u'{{ foo | some_filter(\' \', " ") }}', u'b': u'bar'}), - ) +SPLIT_DATA = ( + (u'a', + [u'a'], + {u'_raw_params': u'a'}), + (u'a=b', + [u'a=b'], + {u'a': u'b'}), + (u'a="foo bar"', + [u'a="foo bar"'], + {u'a': u'foo bar'}), + (u'"foo bar baz"', + [u'"foo bar baz"'], + {u'_raw_params': '"foo bar baz"'}), + (u'foo bar baz', + [u'foo', u'bar', u'baz'], + {u'_raw_params': u'foo bar baz'}), + (u'a=b c="foo bar"', + [u'a=b', u'c="foo bar"'], + {u'a': u'b', u'c': u'foo bar'}), + (u'a="echo \\"hello world\\"" b=bar', + [u'a="echo \\"hello world\\""', u'b=bar'], + {u'a': u'echo "hello world"', u'b': u'bar'}), + (u'a="multi\nline"', + [u'a="multi\nline"'], + {u'a': u'multi\nline'}), + (u'a="blank\n\nline"', + [u'a="blank\n\nline"'], + {u'a': u'blank\n\nline'}), + (u'a="blank\n\n\nlines"', + [u'a="blank\n\n\nlines"'], + {u'a': u'blank\n\n\nlines'}), + (u'a="a long\nmessage\\\nabout a thing\n"', + [u'a="a long\nmessage\\\nabout a thing\n"'], + {u'a': u'a long\nmessage\\\nabout a thing\n'}), + (u'a="multiline\nmessage1\\\n" b="multiline\nmessage2\\\n"', + [u'a="multiline\nmessage1\\\n"', u'b="multiline\nmessage2\\\n"'], + {u'a': 'multiline\nmessage1\\\n', u'b': u'multiline\nmessage2\\\n'}), + (u'a={{jinja}}', + [u'a={{jinja}}'], + {u'a': u'{{jinja}}'}), + (u'a={{ jinja }}', + [u'a={{ jinja }}'], + {u'a': u'{{ jinja }}'}), + (u'a="{{jinja}}"', + [u'a="{{jinja}}"'], + {u'a': u'{{jinja}}'}), + (u'a={{ jinja }}{{jinja2}}', + [u'a={{ jinja }}{{jinja2}}'], + {u'a': u'{{ jinja }}{{jinja2}}'}), + (u'a="{{ jinja }}{{jinja2}}"', + [u'a="{{ jinja }}{{jinja2}}"'], + {u'a': u'{{ jinja }}{{jinja2}}'}), + (u'a={{jinja}} b={{jinja2}}', + [u'a={{jinja}}', u'b={{jinja2}}'], + {u'a': u'{{jinja}}', u'b': u'{{jinja2}}'}), + (u'a="{{jinja}}\n" b="{{jinja2}}\n"', + [u'a="{{jinja}}\n"', u'b="{{jinja2}}\n"'], + {u'a': u'{{jinja}}\n', u'b': u'{{jinja2}}\n'}), + (u'a="café eñyei"', + [u'a="café eñyei"'], + {u'a': u'café eñyei'}), + (u'a=café b=eñyei', + [u'a=café', u'b=eñyei'], + {u'a': u'café', u'b': u'eñyei'}), + (u'a={{ foo | some_filter(\' \', " ") }} b=bar', + [u'a={{ foo | some_filter(\' \', " ") }}', u'b=bar'], + {u'a': u'{{ foo | some_filter(\' \', " ") }}', u'b': u'bar'}), +) - def check_split_args(self, args, expected): - tools.eq_(split_args(args), expected) +SPLIT_ARGS = ((test[0], test[1]) for test in SPLIT_DATA) +PARSE_KV = ((test[0], test[2]) for test in SPLIT_DATA) - def test_split_args(self): - for datapoint in self.SPLIT_DATA: - yield self.check_split_args, datapoint[0], datapoint[1] - def check_parse_kv(self, args, expected): - tools.eq_(parse_kv(args), expected) +@pytest.mark.parametrize("args, expected", SPLIT_ARGS) +def test_split_args(args, expected): + assert split_args(args) == expected - def test_parse_kv(self): - for datapoint in self.SPLIT_DATA: - try: - yield self.check_parse_kv, datapoint[0], datapoint[2] - except: pass + +@pytest.mark.parametrize("args, expected", PARSE_KV) +def test_parse_kv(args, expected): + assert parse_kv(args) == expected diff --git a/test/units/parsing/test_unquote.py b/test/units/parsing/test_unquote.py index 4e5d632066..4b4260e7ba 100644 --- a/test/units/parsing/test_unquote.py +++ b/test/units/parsing/test_unquote.py @@ -20,39 +20,32 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from nose import tools -from ansible.compat.tests import unittest - from ansible.parsing.quoting import unquote +import pytest -# Tests using nose's test generators cannot use unittest base class. -# http://nose.readthedocs.org/en/latest/writing_tests.html#test-generators -class TestUnquote: - UNQUOTE_DATA = ( - (u'1', u'1'), - (u'\'1\'', u'1'), - (u'"1"', u'1'), - (u'"1 \'2\'"', u'1 \'2\''), - (u'\'1 "2"\'', u'1 "2"'), - (u'\'1 \'2\'\'', u'1 \'2\''), - (u'"1\\"', u'"1\\"'), - (u'\'1\\\'', u'\'1\\\''), - (u'"1 \\"2\\" 3"', u'1 \\"2\\" 3'), - (u'\'1 \\\'2\\\' 3\'', u'1 \\\'2\\\' 3'), - (u'"', u'"'), - (u'\'', u'\''), - # Not entirely sure these are good but they match the current - # behaviour - (u'"1""2"', u'1""2'), - (u'\'1\'\'2\'', u'1\'\'2'), - (u'"1" 2 "3"', u'1" 2 "3'), - (u'"1"\'2\'"3"', u'1"\'2\'"3'), - ) +UNQUOTE_DATA = ( + (u'1', u'1'), + (u'\'1\'', u'1'), + (u'"1"', u'1'), + (u'"1 \'2\'"', u'1 \'2\''), + (u'\'1 "2"\'', u'1 "2"'), + (u'\'1 \'2\'\'', u'1 \'2\''), + (u'"1\\"', u'"1\\"'), + (u'\'1\\\'', u'\'1\\\''), + (u'"1 \\"2\\" 3"', u'1 \\"2\\" 3'), + (u'\'1 \\\'2\\\' 3\'', u'1 \\\'2\\\' 3'), + (u'"', u'"'), + (u'\'', u'\''), + # Not entirely sure these are good but they match the current + # behaviour + (u'"1""2"', u'1""2'), + (u'\'1\'\'2\'', u'1\'\'2'), + (u'"1" 2 "3"', u'1" 2 "3'), + (u'"1"\'2\'"3"', u'1"\'2\'"3'), +) - def check_unquote(self, quoted, expected): - tools.eq_(unquote(quoted), expected) - def test_unquote(self): - for datapoint in self.UNQUOTE_DATA: - yield self.check_unquote, datapoint[0], datapoint[1] +@pytest.mark.parametrize("quoted, expected", UNQUOTE_DATA) +def test_unquote(quoted, expected): + assert unquote(quoted) == expected diff --git a/test/utils/shippable/integration-requirements.txt b/test/utils/shippable/integration-requirements.txt deleted file mode 100644 index 45c1e038e5..0000000000 --- a/test/utils/shippable/integration-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -jmespath diff --git a/test/utils/shippable/integration.sh b/test/utils/shippable/integration.sh deleted file mode 100755 index 4f4985c094..0000000000 --- a/test/utils/shippable/integration.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash -eux - -source_root=$(python -c "from os import path; print(path.abspath(path.join(path.dirname('$0'), '../../..')))") - -test_image="${IMAGE:-ansible/ansible:centos7}" -test_privileged="${PRIVILEGED:-false}" -test_flags="${TEST_FLAGS:-}" -test_target="${TARGET:-all}" -test_ansible_dir="${TEST_ANSIBLE_DIR:-/root/ansible}" -test_python3="${PYTHON3:-}" - -http_image="${HTTP_IMAGE:-ansible/ansible:httptester}" - -# Keep the docker containers after tests complete. -# The default behavior is to always remove the containers. -# Set to "onfailure" to keep the containers only on test failure. -# Any other non-empty value will always keep the containers. -keep_containers="${KEEP_CONTAINERS:-}" - -# Run the tests directly from the source directory shared with the container. -# The default behavior is to run the tests on a copy of the source. -# Copying the source isolates changes to the source between host and container. -# Set to any non-empty value to share the source. -share_source="${SHARE_SOURCE:-}" - -# Force ansible color output by default. -# To disable color force mode use FORCE_COLOR=0 -force_color="${FORCE_COLOR:-1}" - -if [ "${SHIPPABLE_BUILD_DIR:-}" ]; then - host_shared_dir="/home/shippable/cache/build-${BUILD_NUMBER}" - controller_shared_dir="/home/shippable/cache/build-${BUILD_NUMBER}" - share_source=1 - test_privileged=false # temporarily disabled to troubleshoot performance issues -else - host_shared_dir="${source_root}" - controller_shared_dir="" -fi - -if [ -z "${share_source}" ]; then - test_shared_dir="/shared" -else - test_shared_dir="${test_ansible_dir}" -fi - -container_id= -httptester_id= -tests_completed= - -function show_environment -{ - docker ps - - if [ -d /home/shippable/cache ]; then - ls -l /home/shippable/cache - fi -} - -function cleanup -{ - if [ "${controller_shared_dir}" ]; then - cp -av "${controller_shared_dir}/shippable" "${SHIPPABLE_BUILD_DIR}" - rm -rf "${controller_shared_dir}" - fi - - if [ "${keep_containers}" == "onfailure" ] && [ "${tests_completed}" != "" ]; then - keep_containers= - fi - - if [ "${keep_containers}" == "" ]; then - if [ "${container_id}" ]; then - docker rm -f "${container_id}" - fi - - if [ "${httptester_id}" ]; then - docker rm -f "${httptester_id}" - fi - fi - - show_environment -} - -trap cleanup EXIT INT TERM -docker images ansible/ansible -show_environment - -if [ "${controller_shared_dir}" ]; then - cp -a "${SHIPPABLE_BUILD_DIR}" "${controller_shared_dir}" -fi - -httptester_id=$(docker run -d "${http_image}") -container_id=$(docker run -d \ - --env "ANSIBLE_FORCE_COLOR=${force_color}" \ - -v "/sys/fs/cgroup:/sys/fs/cgroup:ro" \ - -v "${host_shared_dir}:${test_shared_dir}" \ - --link="${httptester_id}:ansible.http.tests" \ - --link="${httptester_id}:sni1.ansible.http.tests" \ - --link="${httptester_id}:sni2.ansible.http.tests" \ - --link="${httptester_id}:fail.ansible.http.tests" \ - --privileged="${test_privileged}" \ - "${test_image}") - -show_environment - -skip= - -if [ "${test_python3}" ]; then - docker exec "${container_id}" ln -s /usr/bin/python3 /usr/bin/python - docker exec "${container_id}" ln -s /usr/bin/pip3 /usr/bin/pip - - skip+=",$(tr '\n' ',' < "${source_root}/test/utils/shippable/python3-test-tag-blacklist.txt")" -fi - -if [ "${test_privileged}" = 'false' ]; then - skip+=",needs_privileged" -fi - -if [ "${skip}" ]; then - test_flags="--skip-tags ${skip} ${test_flags}" -fi - -if [ -z "${share_source}" ]; then - docker exec "${container_id}" cp -a "${test_shared_dir}" "${test_ansible_dir}" -fi - -docker exec "${container_id}" \ - pip install -r "${test_ansible_dir}/test/utils/shippable/integration-requirements.txt" --upgrade - -if [ "${test_python3}" ]; then - docker exec "${container_id}" sed -i -f \ - "${test_ansible_dir}/test/utils/shippable/python3-test-target-blacklist.txt" \ - "${test_ansible_dir}/test/integration/Makefile" -fi - -docker exec "${container_id}" mkdir -p "${test_shared_dir}/shippable/testresults" -docker exec "${container_id}" /bin/sh -c "cd '${test_ansible_dir}' && . hacking/env-setup && cd test/integration && \ - JUNIT_OUTPUT_DIR='${test_shared_dir}/shippable/testresults' ANSIBLE_CALLBACK_WHITELIST=junit \ - HTTPTESTER=1 TEST_FLAGS='${test_flags}' LC_ALL=en_US.utf-8 make ${test_target}" - -tests_completed=1 diff --git a/test/utils/shippable/python3-test-tag-blacklist.txt b/test/utils/shippable/python3-test-tag-blacklist.txt deleted file mode 100644 index 849074ada2..0000000000 --- a/test/utils/shippable/python3-test-tag-blacklist.txt +++ /dev/null @@ -1,2 +0,0 @@ -test_hg -test_service diff --git a/test/utils/shippable/python3-test-target-blacklist.txt b/test/utils/shippable/python3-test-target-blacklist.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/utils/tox/requirements-py3.txt b/test/utils/tox/requirements-py3.txt index dd5fbe901e..25a925a577 100644 --- a/test/utils/tox/requirements-py3.txt +++ b/test/utils/tox/requirements-py3.txt @@ -13,3 +13,4 @@ python3-memcached python-systemd botocore boto3 +pytest diff --git a/test/utils/tox/requirements.txt b/test/utils/tox/requirements.txt index ffed65293d..03a3013690 100644 --- a/test/utils/tox/requirements.txt +++ b/test/utils/tox/requirements.txt @@ -14,3 +14,4 @@ python-systemd pycrypto botocore boto3 +pytest