Fix tests so that they run via act

ml-tooling · lukasmasuch · Dec 12, 2020 · Nov 16, 2020 · Nov 16, 2020 · Nov 16, 2020
commit 00958150c415bc393b123a3a448223554f21e583
@@ -19,8 +19,7 @@ ENV LC_ALL="en_US.UTF-8" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     TZ="Europe/Berlin" \
-    DEBIAN_FRONTEND="noninteractive" \
-    HOME="/github/home"
+    DEBIAN_FRONTEND="noninteractive"
 
 # Install basics
 # hadolint ignore=DL3005
@@ -79,10 +78,13 @@ RUN pip install pytest
 COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
-RUN mkdir -p $HOME/.ssh/ && \
+RUN mkdir -p /github/home/.ssh/ && \
     # create empty config file if not exists
-    touch $HOME/.ssh/config  && \
-    chown -R root:root $HOME/.ssh && \
-    chmod 700 $HOME/.ssh
+    touch /github/home/.ssh/config  && \
+    chown -R root:root /github/home/.ssh && \
+    chmod 700 /github/home/.ssh && \
+    # create a symlink because ssh looks in the /root/.ssh folder (home of root user) and not in the
+    # actual $HOME directory
+    ln -s /github/home/.ssh /root/.ssh
 
 ENTRYPOINT ["/tini", "-g", "--", "/entrypoint.sh"]
diff --git a/tests/run.py b/tests/run.py
@@ -24,6 +24,7 @@
 
 container.reload()
 ip_address = container.attrs['NetworkSettings']['Networks']['bridge']['IPAddress']
+os.environ["WORKSPACE_NAME"] = workspace_name
 os.environ["WORKSPACE_IP"] = ip_address
 workspace_port = 8080
 

diff --git a/tests/test.py b/tests/test.py
@@ -7,32 +7,33 @@
 import re
 
 # from config import workspace_name, workspace_port
-workspace_name = os.getenv("WORKSPACE_IP", "localhost")
+workspace_host = os.getenv("WORKSPACE_IP", "localhost")
+workspace_name = os.getenv("WORKSPACE_NAME", "")
 workspace_port = 8080
 
 class TestStringMethods(unittest.TestCase):
 
     def test_healthy(self):
-        result = requests.get(f'http://{workspace_name}:{workspace_port}/healthy')
+        result = requests.get(f'http://{workspace_host}:{workspace_port}/healthy')
         print(result.status_code)
         self.assertEqual(result.status_code, 200)
 
     def test_tool_vnc(self):
         # Test whether tools are accessible
-        result = requests.get(f'http://{workspace_name}:{workspace_port}/tools/vnc/?password=vncpassword')
+        result = requests.get(f'http://{workspace_host}:{workspace_port}/tools/vnc/?password=vncpassword')
         self.assertEqual(result.status_code, 200)
         self.assertIn('<title>Desktop VNC</title>', result.text)
 
     def test_tool_vscode(self):
-        result = requests.get(f'http://{workspace_name}:{workspace_port}/tools/vscode/')
+        result = requests.get(f'http://{workspace_host}:{workspace_port}/tools/vscode/')
         self.assertEqual(result.status_code, 200)
         self.assertIn('Microsoft Corporation', result.text)
 
     def test_ssh(self):
-        result = requests.get(f'http://{workspace_name}:{workspace_port}/tooling/ssh/setup-command?origin=http://{workspace_name}:{workspace_port}')
+        result = requests.get(f'http://{workspace_host}:{workspace_port}/tooling/ssh/setup-command?origin=http://{workspace_host}:{workspace_port}')
         self.assertEqual(result.status_code, 200)
         self.assertIn('/bin/bash', result.text)
-        ssh_script_runner_regex = rf'^\/bin\/bash <\(curl -s --insecure "(http:\/\/{workspace_name}:{workspace_port}\/shared\/ssh\/setup\?token=[a-z0-9]+&host={workspace_name}&port={workspace_port})"\)$'
+        ssh_script_runner_regex = rf'^\/bin\/bash <\(curl -s --insecure "(http:\/\/{workspace_host}:{workspace_port}\/shared\/ssh\/setup\?token=[a-z0-9]+&host={workspace_host}&port={workspace_port})"\)$'
         pattern = re.compile(ssh_script_runner_regex)
         match = pattern.match(result.text)
         self.assertIsNotNone(match)
@@ -47,10 +48,6 @@ def test_ssh(self):
         ssh_connection_name = 'test'
         completed_process = run(['/bin/bash -c "/setup-ssh.sh"'], input=ssh_connection_name, encoding='ascii', shell=True, stdout=PIPE, stderr=PIPE)
         self.assertEqual(completed_process.stderr, '')
-        # import time
-        # time.sleep(1200)
-        # problem is that ssh does not look for the ssh config in ~/.ssh/ but only in /etc/ssh/
-        # ssh -o UserKnownHostsFile=~/.ssh/known_hosts -i ~/.ssh/test -F ~/.ssh/config test
         self.assertIn('Connection successful!', completed_process.stdout)
 
         completed_process = run("ssh test 'echo $WORKSPACE_NAME'", shell=True, stdout=PIPE, stderr=PIPE)