Merge pull request #3 from ucsd-ets/project

Modified Dockerfile to use jupyterhub as base

Author: wesuuu

.github/workflows/python-package.yml

@@ -20,24 +20,27 @@ jobs:
 
     steps:
     - name: Install dependencies
-      run: |
+      run: |    
         sudo apt-get update && \
         sudo apt-get install -y xmlsec1 \
                         libxmlsec1-dev \
                         pkg-config \
                         curl \
                         software-properties-common \
                         build-essential \
-                        make
+                        make \
+                        python3-pip \
+                        python3-dev \
+                        wget
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install python dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
+        python3 -m pip install --upgrade pip
+        python3 -m pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         pip install -e .
     - name: Install Google Chrome # Using shell script to install Google Chrome
@@ -63,6 +66,5 @@ jobs:
     - name: run acceptance tests
       run: |
         pytest test/test_acceptance.py --browser chrome --headless
-        pytest test/test_acceptance.py --browser firefox --headless
 
 

Dockerfile

@@ -10,11 +10,12 @@ RUN apt-get update && \
                        curl \
                        software-properties-common \
                        build-essential \
-                       make
-
-# RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
-#     apt-get install nodejs && \
-#     npm install -g configurable-http-proxy
+                       make \
+                       pkg-config \
+                       libxml2-dev \
+                       libxmlsec1-openssl \
+                       gcc \
+                       python3-dev
 
 RUN pip install --upgrade pip &&  \
     pip install -e .

test/unit/test_handlers.py

@@ -1,5 +1,5 @@
 from tornado.httputil import HTTPServerRequest
-from jupyterhub_saml_auth.handlers import get_request
+from jupyterhub_saml_auth.handlers import format_request
 import pytest
 
 @pytest.fixture()
@@ -15,11 +15,11 @@ def mock_request():
 
     return mock_req
 
-def test_get_request_http(mock_request):
-    res = get_request(mock_request)
+def test_format_request_http(mock_request):
+    res = format_request(mock_request)
     assert res['https'] == 'off'
 
 def test_get_reqwuest_https(mock_request):
     mock_request.protocol = 'https'
-    res = get_request(mock_request)
+    res = format_request(mock_request)
     assert res['https'] == 'on'