From 3ffde7330ac7ef80c22e64d564a29292527e1aac Mon Sep 17 00:00:00 2001 From: Pavan Chandrashekar Date: Tue, 10 Mar 2020 10:14:11 -0700 Subject: [PATCH 1/4] Bypass transip tests, they are blocking octodns CI --- script/coverage | 6 +++++- tests/test_octodns_provider_transip.py | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/script/coverage b/script/coverage index ad8189e..69fc844 100755 --- a/script/coverage +++ b/script/coverage @@ -26,7 +26,11 @@ export DYN_PASSWORD= export DYN_USERNAME= export GOOGLE_APPLICATION_CREDENTIALS= -coverage run --branch --source=octodns --omit=octodns/cmds/* "$(command -v nosetests)" --with-xunit "$@" + +OMIT_PATHS=("octodns/cmds/*" + "octodns/provider/transip*.py") # FIXME Transip tests are failing. Omitting them until they are fixed + +coverage run --branch --source=octodns --omit=$(echo ${OMIT_PATHS[@]} | tr ' ' ',') "$(command -v nosetests)" --with-xunit "$@" coverage html coverage xml coverage report --show-missing diff --git a/tests/test_octodns_provider_transip.py b/tests/test_octodns_provider_transip.py index 3fbfc44..278d43e 100644 --- a/tests/test_octodns_provider_transip.py +++ b/tests/test_octodns_provider_transip.py @@ -99,6 +99,10 @@ class MockDomainService(DomainService): class TestTransipProvider(TestCase): + # FIXME Tests are breaking at the moment. Set bypass_tests to False once + # they are working again + bypass_tests = True + bogus_key = str("""-----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEA0U5HGCkLrz423IyUf3u4cKN2WrNz1x5KNr6PvH2M/zxas+zB elbxkdT3AQ+wmfcIvOuTmFRTHv35q2um1aBrPxVw+2s+lWo28VwIRttwIB1vIeWu @@ -134,6 +138,9 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd return expected def test_init(self): + if self.bypass_tests: + return + with self.assertRaises(Exception) as ctx: TransipProvider('test', 'unittest') @@ -147,6 +154,9 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd TransipProvider('test', 'unittest', key_file='/fake/path') def test_populate(self): + if self.bypass_tests: + return + _expected = self.make_expected() # Unhappy Plan - Not authenticated @@ -214,6 +224,9 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd return def test_plan(self): + if self.bypass_tests: + return + _expected = self.make_expected() # Test Happy plan, only create @@ -228,6 +241,9 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd return def test_apply(self): + if self.bypass_tests: + return + _expected = self.make_expected() # Test happy flow. Create all supoorted records From c8f93ea010b31038639f40101544b3a567b4e132 Mon Sep 17 00:00:00 2001 From: Pavan Chandrashekar Date: Tue, 10 Mar 2020 12:32:46 -0700 Subject: [PATCH 2/4] Use unittest.skip() to skip tests --- tests/test_octodns_provider_transip.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tests/test_octodns_provider_transip.py b/tests/test_octodns_provider_transip.py index 278d43e..6ed7c06 100644 --- a/tests/test_octodns_provider_transip.py +++ b/tests/test_octodns_provider_transip.py @@ -11,6 +11,7 @@ from six import text_type from suds import WebFault from unittest import TestCase +from unittest import skip from octodns.provider.transip import TransipProvider from octodns.provider.yaml import YamlProvider @@ -97,11 +98,10 @@ class MockDomainService(DomainService): document = {} raise WebFault(fault, document) - +# FIXME Skipping broken tests for now. Revert this once they are found to +# be working again +@skip("Skipping broken transip tests") class TestTransipProvider(TestCase): - # FIXME Tests are breaking at the moment. Set bypass_tests to False once - # they are working again - bypass_tests = True bogus_key = str("""-----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEA0U5HGCkLrz423IyUf3u4cKN2WrNz1x5KNr6PvH2M/zxas+zB @@ -138,9 +138,6 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd return expected def test_init(self): - if self.bypass_tests: - return - with self.assertRaises(Exception) as ctx: TransipProvider('test', 'unittest') @@ -154,9 +151,6 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd TransipProvider('test', 'unittest', key_file='/fake/path') def test_populate(self): - if self.bypass_tests: - return - _expected = self.make_expected() # Unhappy Plan - Not authenticated @@ -224,9 +218,6 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd return def test_plan(self): - if self.bypass_tests: - return - _expected = self.make_expected() # Test Happy plan, only create @@ -241,9 +232,6 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd return def test_apply(self): - if self.bypass_tests: - return - _expected = self.make_expected() # Test happy flow. Create all supoorted records From 4432d4959181c2fc9ad8067264b6fd216a68161a Mon Sep 17 00:00:00 2001 From: Pavan Chandrashekar Date: Tue, 10 Mar 2020 12:41:16 -0700 Subject: [PATCH 3/4] Minor fix. Coverage uses bourne shell, not bash --- script/coverage | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/script/coverage b/script/coverage index 69fc844..9dd0d89 100755 --- a/script/coverage +++ b/script/coverage @@ -27,10 +27,9 @@ export DYN_USERNAME= export GOOGLE_APPLICATION_CREDENTIALS= -OMIT_PATHS=("octodns/cmds/*" - "octodns/provider/transip*.py") # FIXME Transip tests are failing. Omitting them until they are fixed +OMIT_PATHS="octodns/cmds/*,octodns/provider/transip*.py" # FIXME Transip tests are failing. Omitting them until they are fixed -coverage run --branch --source=octodns --omit=$(echo ${OMIT_PATHS[@]} | tr ' ' ',') "$(command -v nosetests)" --with-xunit "$@" +coverage run --branch --source=octodns --omit=${OMIT_PATHS} "$(command -v nosetests)" --with-xunit "$@" coverage html coverage xml coverage report --show-missing From fd037e873b1eddaf0323a172c6bef2246ede58b1 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Mon, 16 Mar 2020 07:45:32 -0700 Subject: [PATCH 4/4] Transip v2.1.1, back out test skips and coverage omits --- requirements.txt | 2 +- script/coverage | 5 +---- tests/test_octodns_provider_transip.py | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index d77f298..1f1121b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,4 @@ requests==2.23.0 s3transfer==0.3.3 setuptools==44.0.0 six==1.14.0 -transip==2.0.0 +transip==2.1.1 diff --git a/script/coverage b/script/coverage index 9dd0d89..ad8189e 100755 --- a/script/coverage +++ b/script/coverage @@ -26,10 +26,7 @@ export DYN_PASSWORD= export DYN_USERNAME= export GOOGLE_APPLICATION_CREDENTIALS= - -OMIT_PATHS="octodns/cmds/*,octodns/provider/transip*.py" # FIXME Transip tests are failing. Omitting them until they are fixed - -coverage run --branch --source=octodns --omit=${OMIT_PATHS} "$(command -v nosetests)" --with-xunit "$@" +coverage run --branch --source=octodns --omit=octodns/cmds/* "$(command -v nosetests)" --with-xunit "$@" coverage html coverage xml coverage report --show-missing diff --git a/tests/test_octodns_provider_transip.py b/tests/test_octodns_provider_transip.py index 6ed7c06..f792085 100644 --- a/tests/test_octodns_provider_transip.py +++ b/tests/test_octodns_provider_transip.py @@ -11,7 +11,6 @@ from six import text_type from suds import WebFault from unittest import TestCase -from unittest import skip from octodns.provider.transip import TransipProvider from octodns.provider.yaml import YamlProvider @@ -98,9 +97,7 @@ class MockDomainService(DomainService): document = {} raise WebFault(fault, document) -# FIXME Skipping broken tests for now. Revert this once they are found to -# be working again -@skip("Skipping broken transip tests") + class TestTransipProvider(TestCase): bogus_key = str("""-----BEGIN RSA PRIVATE KEY-----