Commit 738f0dec authored by Ivan Tyagov's avatar Ivan Tyagov Committed by Łukasz Nowak

Fix newlines.

parent f534581a
...@@ -311,6 +311,7 @@ class KedifaMixinCaucase(KedifaMixin): ...@@ -311,6 +311,7 @@ class KedifaMixinCaucase(KedifaMixin):
def requests_put(self, *args, **kwargs): def requests_put(self, *args, **kwargs):
return requests.put(verify=self.ca_crt_pem, *args, **kwargs) return requests.put(verify=self.ca_crt_pem, *args, **kwargs)
@unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only') @unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only')
class KedifaIntegrationTest(KedifaMixinCaucase, unittest.TestCase): class KedifaIntegrationTest(KedifaMixinCaucase, unittest.TestCase):
def assertAnyLogEntry(self, entry): def assertAnyLogEntry(self, entry):
...@@ -1169,6 +1170,7 @@ class KedifaUpdaterMixin(KedifaMixin): ...@@ -1169,6 +1170,7 @@ class KedifaUpdaterMixin(KedifaMixin):
mapping.close() mapping.close()
self.mapping = mapping.name self.mapping = mapping.name
@unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only') @unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only')
class KedifaUpdaterMappingTest(KedifaUpdaterMixin, unittest.TestCase): class KedifaUpdaterMappingTest(KedifaUpdaterMixin, unittest.TestCase):
def test_updateMapping_empty(self): def test_updateMapping_empty(self):
...@@ -1221,6 +1223,7 @@ class KedifaUpdaterMappingTest(KedifaUpdaterMixin, unittest.TestCase): ...@@ -1221,6 +1223,7 @@ class KedifaUpdaterMappingTest(KedifaUpdaterMixin, unittest.TestCase):
u.updateMapping() u.updateMapping()
self.assertEqual(u.mapping, {'file': ('url', None)}) self.assertEqual(u.mapping, {'file': ('url', None)})
@unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only') @unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only')
class KedifaUpdaterUpdateCertificateTest( class KedifaUpdaterUpdateCertificateTest(
KedifaUpdaterMixin, unittest.TestCase): KedifaUpdaterMixin, unittest.TestCase):
...@@ -1402,6 +1405,7 @@ class KedifaUpdaterUpdateCertificateTest( ...@@ -1402,6 +1405,7 @@ class KedifaUpdaterUpdateCertificateTest(
self.assertTrue(update) self.assertTrue(update)
self.assertState({self.certificate_file_name: True}) self.assertState({self.certificate_file_name: True})
@unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only') @unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only')
class KedifaUpdaterUpdateCertificatePrepareTest( class KedifaUpdaterUpdateCertificatePrepareTest(
KedifaUpdaterMixin, unittest.TestCase): KedifaUpdaterMixin, unittest.TestCase):
...@@ -1489,6 +1493,7 @@ class KedifaUpdaterUpdateCertificatePrepareTest( ...@@ -1489,6 +1493,7 @@ class KedifaUpdaterUpdateCertificatePrepareTest(
certificate='cert', master_content='master', fallback='fallback') certificate='cert', master_content='master', fallback='fallback')
self.assertEqual('cert', certificate) self.assertEqual('cert', certificate)
@unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only') @unittest.skipIf(sys.version_info >= (3, ), 'kedifa currently supports python 2 only')
class KedifaUpdaterLoopTest( class KedifaUpdaterLoopTest(
KedifaUpdaterMixin, unittest.TestCase): KedifaUpdaterMixin, unittest.TestCase):
......
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