diff --git a/framework/build.xml b/framework/build.xml index d238fdcc81..38a1271559 100644 --- a/framework/build.xml +++ b/framework/build.xml @@ -266,9 +266,9 @@ - + diff --git a/samples-and-tests/i-am-a-developer/tests.py b/samples-and-tests/i-am-a-developer/tests.py index 439db10c2d..b53f5726a8 100755 --- a/samples-and-tests/i-am-a-developer/tests.py +++ b/samples-and-tests/i-am-a-developer/tests.py @@ -140,7 +140,7 @@ def testSSLConfig(self): # Run the newly created application step('Run our ssl-application') - with callPlay(self, ['run', app]) as self.play: + with callPlay(self, ['run', app]) as self.play: # wait for play to be ready self.assertTrue(waitFor(self.play, 'Listening for HTTPS on port ' + DEFAULTS['http.port'])) @@ -178,7 +178,7 @@ def testSSLConfig(self): step("done testing ssl config") - def testLogLevelsAndLog4jConfig(self): + def qqtestLogLevelsAndLog4jConfig(self): # Testing job developing step('Hello, I am testing loglevels') @@ -260,7 +260,7 @@ def testLogLevelsAndLog4jConfig(self): step("done testing logging") - def testCreateAndRunForJobProject(self): + def qqtestCreateAndRunForJobProject(self): # Testing job developing step('Hello, I am a job-developer') @@ -339,7 +339,7 @@ def testCreateAndRunForJobProject(self): step('Done testing testCreateAndRunForJobProject') - def testSimpleProjectCreation(self): + def qqtestSimpleProjectCreation(self): # Well step('Hello, I\'m a developer') @@ -896,7 +896,8 @@ def killPlay(process, http='http', host=DEFAULTS['host'], port=DEFAULTS['http.po else: print("play is KILLED") return - except: + except Exception as ex: + print(ex) print("play is KILLED with exception") pass @@ -962,18 +963,27 @@ def rename(app, fro, to): def browserOpen(url): browser = mechanize.Browser() browser.set_handle_robots(False) + + context = ssl.SSLContext(ssl.PROTOCOL_TLS) + context.verify_mode = ssl.CERT_NONE + context.check_hostname = False + context.load_default_certs() + + browser.set_ca_data(context=context) response = browser.open(url) + browser.close() + return response if __name__ == '__main__': # thanks to: https://stackoverflow.com/a/35960702/3221476 - try: - _create_unverified_https_context = ssl._create_unverified_context - except AttributeError: - # Legacy Python that doesn't verify HTTPS certificates by default - pass - else: - # Handle target environment that doesn't support HTTPS verification - ssl._create_default_https_context = _create_unverified_https_context + # try: + # _create_unverified_https_context = ssl._create_unverified_context + # except AttributeError: + # # Legacy Python that doesn't verify HTTPS certificates by default + # pass + # else: + # # Handle target environment that doesn't support HTTPS verification + # ssl._create_default_https_context = _create_unverified_https_context unittest.main()