Skip to content

Commit afb24a4

Browse files
authored
use getpass.getuser instead of os.getlogin (#789)
use getpass.getuser instead of os.getlogin
2 parents 3f8e56d + 00b7706 commit afb24a4

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ steps:
77
inputs:
88
versionSpec: '3.6'
99

10+
- script: |
11+
git config --global user.email "[email protected]"
12+
git config --global user.name "CI Services"
13+
displayName: 'Set up git'
14+
1015
- script: python -m pip install --upgrade pip setuptools wheel
1116
displayName: 'Install tools'
1217

tests/unit/test_env.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import subprocess
66
import tempfile
77
import time
8+
from getpass import getuser
89

910

1011
def test_env():
@@ -13,7 +14,7 @@ def test_env():
1314
"""
1415
ts = str(time.time())
1516
with tempfile.TemporaryDirectory() as tmpdir:
16-
username = os.getlogin()
17+
username = getuser()
1718
subprocess.check_call(
1819
[
1920
"repo2docker",

tests/unit/test_ports.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import os
88
import tempfile
99
import random
10+
from getpass import getuser
1011

1112
import docker
1213
import pytest
@@ -46,7 +47,7 @@ def read_port_mapping_response(
4647
request.addfinalizer(td.cleanup)
4748
tmpdir.chdir()
4849

49-
username = os.getlogin()
50+
username = getuser()
5051
tmpdir.mkdir("username")
5152
r2d = Repo2Docker(
5253
repo=str(tmpdir.mkdir("repo")),

tests/unit/test_users.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import subprocess
66
import tempfile
77
import time
8+
from getpass import getuser
89
from unittest import mock
910

1011
from repo2docker import Repo2Docker
@@ -26,7 +27,7 @@ def test_user():
2627
"""
2728
ts = str(time.time())
2829
# FIXME: Use arbitrary login here, We need it now since we wanna put things to volume.
29-
username = os.getlogin()
30+
username = getuser()
3031
userid = str(os.geteuid())
3132
with tempfile.TemporaryDirectory() as tmpdir:
3233
tmpdir = os.path.realpath(tmpdir)

tests/unit/test_volumes.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
"""
22
Test that volume mounts work when running
33
"""
4+
45
import os
56
import subprocess
67
import tempfile
78
import time
9+
from getpass import getuser
810

911

1012
def test_volume_abspath():
@@ -15,7 +17,7 @@ def test_volume_abspath():
1517
with tempfile.TemporaryDirectory() as tmpdir:
1618
tmpdir = os.path.realpath(tmpdir)
1719

18-
username = os.getlogin()
20+
username = getuser()
1921
subprocess.check_call(
2022
[
2123
"repo2docker",
@@ -54,7 +56,7 @@ def test_volume_relpath():
5456
"--user-id",
5557
str(os.geteuid()),
5658
"--user-name",
57-
os.getlogin(),
59+
getuser(),
5860
tmpdir,
5961
"--",
6062
"/bin/bash",

0 commit comments

Comments
 (0)