self signed certificate - ssl disabling support w/ testing (#124)

* added a ssl failure test, ssl disabling path is now correct

* moved resources

* kill instead of terminate; actually closes the sockets

* swapped from process kill to os.kill path to be compliant with 3.6

* separated normal tests from self signed cert tests where it made sense, split fastAPI to support all endpoints as both regular mode and self signed mode

Author: zeryx

.gitignore

@@ -1,6 +1,7 @@
 #Eclipse
 .project
-
+venv
+venv_win
 TestFiles
 test.txt
 

Algorithmia/client.py

@@ -41,6 +41,7 @@ def __init__(self, apiKey=None, apiAddress=None, caCert=None, bearerToken=None):
             self.apiAddress = Algorithmia.getApiAddress()
         if caCert == False:
             self.requestSession.verify = False
+            self.requestSession.trust_env = False
             config = Configuration(use_ssl=False)
         elif caCert is None and 'REQUESTS_CA_BUNDLE' in os.environ:
             caCert = os.environ.get('REQUESTS_CA_BUNDLE')

Test/api/__init__.py

@@ -1,12 +1,15 @@
 import sys
 from time import sleep
+import os, signal
 if sys.version_info.major >= 3:
-    from Test.api import start_webserver
+    from Test.api import start_webserver_reg, start_webserver_self_signed
     import pytest
 
     @pytest.fixture(scope='package', autouse=True)
     def fastapi_start():
-        p = start_webserver()
+        p_reg = start_webserver_reg()
+        p_self_signed = start_webserver_self_signed()
         sleep(2)
-        yield p
-        p.terminate()
+        yield p_reg, p_self_signed
+        os.kill(p_reg.pid, signal.SIGKILL)
+        os.kill(p_self_signed.pid, signal.SIGKILL)

Test/api/app.py

@@ -93,8 +93,8 @@ def setUp(self):
         # create a directory to use in testing the cp command
         self.client = Algorithmia.client()
         CLI().mkdir("data://.my/moredata", self.client)
-        if not os.path.exists("./TestFiles/"):
-            os.mkdir("./TestFiles/")
+        if not os.path.exists("../TestFiles/"):
+            os.mkdir("../TestFiles/")
 
     def test_ls(self):
         parentDir = "data://.my/"
@@ -132,7 +132,7 @@ def test_rmdir(self):
 
     def test_cat(self):
         file = "data://.my/moredata/test.txt"
-        localfile = "./TestFiles/test.txt"
+        localfile = "./../TestFiles/test.txt"
         fileContents = "some text in test file"
 
         CLI().rm(file, self.client)
@@ -156,7 +156,7 @@ def test_get_build_logs(self):
 
     # local to remote
     def test_cp_L2R(self):
-        localfile = "./TestFiles/test.txt"
+        localfile = "./../TestFiles/test.txt"
         testfile = open(localfile, "w")
         testfile.write("some text")
         testfile.close()
@@ -199,7 +199,7 @@ def test_auth(self):
 
     def test_auth_cert(self):
 
-        localfile = "./TestFiles/fakecert.pem"
+        localfile = "./../TestFiles/fakecert.pem"
 
         testfile = open(localfile, "w")
         testfile.write("")
@@ -244,7 +244,7 @@ def test_list_languages(self):
         self.assertTrue(result is not None and "anaconda3" in result[1])
 
     def test_rm(self):
-        localfile = "./TestFiles/testRM.txt"
+        localfile = "./../TestFiles/testRM.txt"
 
         testfile = open(localfile, "w")
         testfile.write("some text")
@@ -263,7 +263,7 @@ def test_rm(self):
         self.assertTrue("testRM.txt" in result1 and "testRM.txt" not in result2)
 
     def test_get_template(self):
-        filename = "./temptest"
+        filename = "./../temptest"
         envid = "36fd467e-fbfe-4ea6-aa66-df3f403b7132"
         response = CLI().get_template(envid, filename, self.client)
         print(response)

Test/api/self_signed_app.py

@@ -11,8 +11,6 @@
     # you will load the version installed on the computer.
     sys.path = ['../'] + sys.path
     from requests import Response
-    from Test.api import app
-
 
     class AlgoTest(unittest.TestCase):
         error_500 = Response()