From: Thanh Ha Date: Mon, 6 Mar 2017 00:30:23 +0000 (-0500) Subject: Make create version tests easier X-Git-Tag: v0.0.7~2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=011aae5502790adf441c909afa344250e67811be;p=releng%2Flftools.git Make create version tests easier This patch allows version tests to simply be placing files into a directory and comparing the test results from an input pom and an expected pom. Also add a test to validate bump order. Change-Id: Ide4da6f721223bc4d3edab79db9008e4cae730c6 Signed-off-by: Thanh Ha --- diff --git a/tests/fixtures/version_bump/bump_order/README b/tests/fixtures/version_bump/bump_order/README new file mode 100644 index 00000000..5e013c73 --- /dev/null +++ b/tests/fixtures/version_bump/bump_order/README @@ -0,0 +1,5 @@ +This test checks that version bump order is maintained: + +1) bump date-based versions +2) bump -SNAPSHOT versions +3) bump -RELEASE versions diff --git a/tests/fixtures/version_bump/bump_order/pom.xml b/tests/fixtures/version_bump/bump_order/pom.xml new file mode 100644 index 00000000..958e72c2 --- /dev/null +++ b/tests/fixtures/version_bump/bump_order/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + org.linuxfoundation.releng + test-artifact + 1.0.0-TestRelease + + + + + org.opendaylight.mdsal.model + yang-ext + 2013.09.07.10-SNAPSHOT + + + org.opendaylight.mdsal.model + general-entity + 0.10.0-SNAPSHOT + + + + diff --git a/tests/fixtures/version_bump/bump_order/pom.xml.expected b/tests/fixtures/version_bump/bump_order/pom.xml.expected new file mode 100644 index 00000000..f6bf9231 --- /dev/null +++ b/tests/fixtures/version_bump/bump_order/pom.xml.expected @@ -0,0 +1,23 @@ + + + 4.0.0 + org.linuxfoundation.releng + test-artifact + 1.0.1-SNAPSHOT + + + + + org.opendaylight.mdsal.model + yang-ext + 2013.09.07.11.0-SNAPSHOT + + + org.opendaylight.mdsal.model + general-entity + 0.11.0-SNAPSHOT + + + + diff --git a/tests/fixtures/version_bump/release/README b/tests/fixtures/version_bump/release/README new file mode 100644 index 00000000..c2282037 --- /dev/null +++ b/tests/fixtures/version_bump/release/README @@ -0,0 +1,2 @@ +This test checks that a release artifact is version bumped by +x.y.(z+1)-SNAPSHOT when version bump is performed. diff --git a/tests/fixtures/pom.xml.expected-release b/tests/fixtures/version_bump/release/pom.xml similarity index 100% rename from tests/fixtures/pom.xml.expected-release rename to tests/fixtures/version_bump/release/pom.xml diff --git a/tests/fixtures/pom.xml.expected-release-bump b/tests/fixtures/version_bump/release/pom.xml.expected similarity index 100% rename from tests/fixtures/pom.xml.expected-release-bump rename to tests/fixtures/version_bump/release/pom.xml.expected diff --git a/tests/fixtures/version_bump/snapshot/README b/tests/fixtures/version_bump/snapshot/README new file mode 100644 index 00000000..5cc53b92 --- /dev/null +++ b/tests/fixtures/version_bump/snapshot/README @@ -0,0 +1,2 @@ +This test checks that a SNAPSHOT artifact is properly bumped by +x.(y+1).z-SNAPSHOT when version bump is run. diff --git a/tests/fixtures/pom.xml b/tests/fixtures/version_bump/snapshot/pom.xml similarity index 100% rename from tests/fixtures/pom.xml rename to tests/fixtures/version_bump/snapshot/pom.xml diff --git a/tests/fixtures/pom.xml.expected-bump b/tests/fixtures/version_bump/snapshot/pom.xml.expected similarity index 100% rename from tests/fixtures/pom.xml.expected-bump rename to tests/fixtures/version_bump/snapshot/pom.xml.expected diff --git a/tests/fixtures/version_release/snapshot/README b/tests/fixtures/version_release/snapshot/README new file mode 100644 index 00000000..de8d05e4 --- /dev/null +++ b/tests/fixtures/version_release/snapshot/README @@ -0,0 +1,2 @@ +This test checks that SNAPSHOT artifacts properly get converted to a +RELEASE_TAG as passed in by the user. diff --git a/tests/fixtures/version_release/snapshot/pom.xml b/tests/fixtures/version_release/snapshot/pom.xml new file mode 100644 index 00000000..0b4d73d5 --- /dev/null +++ b/tests/fixtures/version_release/snapshot/pom.xml @@ -0,0 +1,8 @@ + + + 4.0.0 + org.linuxfoundation.releng + test-artifact + 1.0.0-SNAPSHOT + diff --git a/tests/fixtures/version_release/snapshot/pom.xml.expected b/tests/fixtures/version_release/snapshot/pom.xml.expected new file mode 100644 index 00000000..f8769e37 --- /dev/null +++ b/tests/fixtures/version_release/snapshot/pom.xml.expected @@ -0,0 +1,8 @@ + + + 4.0.0 + org.linuxfoundation.releng + test-artifact + 1.0.0-TestRelease + diff --git a/tests/test_version.py b/tests/test_version.py index 9d8fe847..09e5b3f4 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -16,29 +16,26 @@ FIXTURE_DIR = os.path.join( @pytest.mark.datafiles( - os.path.join(FIXTURE_DIR, 'pom.xml'), - os.path.join(FIXTURE_DIR, 'pom.xml.expected-bump'), + os.path.join(FIXTURE_DIR, 'version_bump'), ) def test_version_bump(cli_runner, datafiles): os.chdir(datafiles) - - # Version bump should bump versions by x.(y+1).z result = cli_runner.invoke(cli.cli, ['version', 'bump', 'TestRelease']) - assert filecmp.cmp('pom.xml', 'pom.xml.expected-bump') + + for _file in datafiles.listdir(): + pom = str(_file) + '/pom.xml' + expected_pom = str(_file) + '/pom.xml.expected' + assert filecmp.cmp(pom, expected_pom) @pytest.mark.datafiles( - os.path.join(FIXTURE_DIR, 'pom.xml'), - os.path.join(FIXTURE_DIR, 'pom.xml.expected-release'), - os.path.join(FIXTURE_DIR, 'pom.xml.expected-release-bump'), + os.path.join(FIXTURE_DIR, 'version_release'), ) def test_version_release(cli_runner, datafiles): os.chdir(datafiles) - - # Version release should modify SNAPSHOT to TestRelease result = cli_runner.invoke(cli.cli, ['version', 'release', 'TestRelease']) - assert filecmp.cmp('pom.xml', 'pom.xml.expected-release') - # Post release bump should bump versions by x.y.(z+1) and revert back to SNAPSHOT - result = cli_runner.invoke(cli.cli, ['version', 'bump', 'TestRelease']) - assert filecmp.cmp('pom.xml', 'pom.xml.expected-release-bump') + for _file in datafiles.listdir(): + pom = str(_file) + '/pom.xml' + expected_pom = str(_file) + '/pom.xml.expected' + assert filecmp.cmp(pom, expected_pom)