kopia lustrzana https://github.com/jupyterhub/repo2docker
use getpass.getuser instead of os.getlogin
os.getlogin doesn't work everywhere (can raise OSError, inappropriate ioctl for device)pull/789/head
rodzic
3f8e56d0d9
commit
f47acaa1bd
|
@ -5,6 +5,7 @@ import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
|
from getpass import getuser
|
||||||
|
|
||||||
|
|
||||||
def test_env():
|
def test_env():
|
||||||
|
@ -13,7 +14,7 @@ def test_env():
|
||||||
"""
|
"""
|
||||||
ts = str(time.time())
|
ts = str(time.time())
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
username = os.getlogin()
|
username = getuser()
|
||||||
subprocess.check_call(
|
subprocess.check_call(
|
||||||
[
|
[
|
||||||
"repo2docker",
|
"repo2docker",
|
||||||
|
|
|
@ -7,6 +7,7 @@ import time
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
import random
|
import random
|
||||||
|
from getpass import getuser
|
||||||
|
|
||||||
import docker
|
import docker
|
||||||
import pytest
|
import pytest
|
||||||
|
@ -46,7 +47,7 @@ def read_port_mapping_response(
|
||||||
request.addfinalizer(td.cleanup)
|
request.addfinalizer(td.cleanup)
|
||||||
tmpdir.chdir()
|
tmpdir.chdir()
|
||||||
|
|
||||||
username = os.getlogin()
|
username = getuser()
|
||||||
tmpdir.mkdir("username")
|
tmpdir.mkdir("username")
|
||||||
r2d = Repo2Docker(
|
r2d = Repo2Docker(
|
||||||
repo=str(tmpdir.mkdir("repo")),
|
repo=str(tmpdir.mkdir("repo")),
|
||||||
|
|
|
@ -5,6 +5,7 @@ import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
|
from getpass import getuser
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from repo2docker import Repo2Docker
|
from repo2docker import Repo2Docker
|
||||||
|
@ -26,7 +27,7 @@ def test_user():
|
||||||
"""
|
"""
|
||||||
ts = str(time.time())
|
ts = str(time.time())
|
||||||
# FIXME: Use arbitrary login here, We need it now since we wanna put things to volume.
|
# FIXME: Use arbitrary login here, We need it now since we wanna put things to volume.
|
||||||
username = os.getlogin()
|
username = getuser()
|
||||||
userid = str(os.geteuid())
|
userid = str(os.geteuid())
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
tmpdir = os.path.realpath(tmpdir)
|
tmpdir = os.path.realpath(tmpdir)
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
"""
|
"""
|
||||||
Test that volume mounts work when running
|
Test that volume mounts work when running
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
|
from getpass import getuser
|
||||||
|
|
||||||
|
|
||||||
def test_volume_abspath():
|
def test_volume_abspath():
|
||||||
|
@ -15,7 +17,7 @@ def test_volume_abspath():
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
tmpdir = os.path.realpath(tmpdir)
|
tmpdir = os.path.realpath(tmpdir)
|
||||||
|
|
||||||
username = os.getlogin()
|
username = getuser()
|
||||||
subprocess.check_call(
|
subprocess.check_call(
|
||||||
[
|
[
|
||||||
"repo2docker",
|
"repo2docker",
|
||||||
|
@ -54,7 +56,7 @@ def test_volume_relpath():
|
||||||
"--user-id",
|
"--user-id",
|
||||||
str(os.geteuid()),
|
str(os.geteuid()),
|
||||||
"--user-name",
|
"--user-name",
|
||||||
os.getlogin(),
|
getuser(),
|
||||||
tmpdir,
|
tmpdir,
|
||||||
"--",
|
"--",
|
||||||
"/bin/bash",
|
"/bin/bash",
|
||||||
|
|
Ładowanie…
Reference in New Issue