Skip to content

Commit d8942c4

Browse files
authored
Merge pull request #1218 from consideRatio/pr/test-cleanup
ci: cleanup no longer used test logic related to memlimit
2 parents 9be3ac6 + 98aceac commit d8942c4

File tree

6 files changed

+1
-81
lines changed

6 files changed

+1
-81
lines changed

tests/base/node/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Test that node 12 and npm 6 are installed and runnable.
1+
Test that node 16 and npm 8 are installed and runnable.

tests/memlimit/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/memlimit/dockerfile/Dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/memlimit/dockerfile/postBuild

Lines changed: 0 additions & 27 deletions
This file was deleted.

tests/memlimit/non-dockerfile/postBuild

Lines changed: 0 additions & 27 deletions
This file was deleted.

tests/unit/test_memlimit.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,6 @@ def test_memory_limit_enforced(tmpdir):
4747
}
4848

4949

50-
def test_memlimit_same_postbuild():
51-
"""
52-
Validate that the postBuild files for the dockerfile and non-dockerfile
53-
tests are the same
54-
55-
Until https://github.com/jupyterhub/repo2docker/issues/160 gets fixed.
56-
"""
57-
filepaths = [
58-
os.path.join(basedir, "memlimit", t, "postBuild")
59-
for t in ("dockerfile", "non-dockerfile")
60-
]
61-
file_contents = []
62-
for fp in filepaths:
63-
with open(fp) as f:
64-
file_contents.append(f.read())
65-
# Make sure they're all the same
66-
assert len(set(file_contents)) == 1
67-
68-
6950
@pytest.mark.parametrize("BuildPack", [BaseImage, DockerBuildPack])
7051
def test_memlimit_argument_type(BuildPack):
7152
# check that an exception is raised when the memory limit isn't an int

0 commit comments

Comments
 (0)