Fix bad merge

Author: ddworken

tests/bot-entrypoint.py

@@ -25,9 +25,9 @@ def load_env():
         "bin/keybaseca --wipe-logs || true\n"
         "bin/keybaseca generate --overwrite-existing-key\n"
         # The output from this backup is tested in test_env_1.py
-        "echo yes | bin/keybaseca backup > /mnt/cakey.backup\n"
+        "echo yes | bin/keybaseca backup > /shared/cakey.backup\n"
         # The output from this sign operation is tested in test_env_1.py
-        "ssh-keygen -t ed25519 -f /mnt/userkey -N '' && bin/keybaseca sign --public-key /mnt/userkey.pub > /mnt/keybaseca-sign.out\n"
+        "ssh-keygen -t ed25519 -f /shared/userkey -N '' && bin/keybaseca sign --public-key /shared/userkey.pub > /shared/keybaseca-sign.out\n"
         "bin/keybaseca service &"
     ) % (shlex.quote(path)))
     # Sleep so keybaseca has time to start

tests/tests/test_env_1.py

@@ -135,14 +135,14 @@ def test_keybaseca_backup(self):
 
     def test_keybaseca_sign(self, test_config):
         # Stdout contains a useful message
-        with open('/mnt/keybaseca-sign.out') as f:
+        with open('/shared/keybaseca-sign.out') as f:
             assert "Provisioned new certificate" in f.read()
 
         # SSH with that certificate should just work for every team
-        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /mnt/userkey user@sshd-prod 'sha1sum /etc/unique'"))
-        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /mnt/userkey root@sshd-prod 'sha1sum /etc/unique'"))
-        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /mnt/userkey user@sshd-staging 'sha1sum /etc/unique'"))
-        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /mnt/userkey root@sshd-prod 'sha1sum /etc/unique'"))
+        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /shared/userkey user@sshd-prod 'sha1sum /etc/unique'"))
+        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /shared/userkey root@sshd-prod 'sha1sum /etc/unique'"))
+        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /shared/userkey user@sshd-staging 'sha1sum /etc/unique'"))
+        assert_contains_hash(test_config.expected_hash, run_command(f"ssh -q -o StrictHostKeyChecking=no -i /shared/userkey root@sshd-prod 'sha1sum /etc/unique'"))
 
         # Checking that it actually contains the correct principals
-        assert get_principals("/mnt/userkey-cert.pub") == set(test_config.subteams)
+        assert get_principals("/shared/userkey-cert.pub") == set(test_config.subteams)