summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLokesh Mandvekar <lsm5@fedoraproject.org>2020-08-28 09:26:33 -0400
committerLokesh Mandvekar <lsm5@fedoraproject.org>2020-08-28 09:26:33 -0400
commit8a261349499a1f66aaea0576a2a84d0b104df3bb (patch)
treebdb9a0d3ae843214d2b9af1b13616c4a2ef8b842
parentcf6d9fe4e66895791418793341c67030fd12c455 (diff)
downloadpodman-8a261349499a1f66aaea0576a2a84d0b104df3bb.tar.gz
podman-8a261349499a1f66aaea0576a2a84d0b104df3bb.tar.bz2
podman-8a261349499a1f66aaea0576a2a84d0b104df3bb.zip
Delete prior /dev/shm/*
Currently, subsequent runs of `make localunit` fail and complain about prior existing /dev/shm/libpod_test and /dev/shm/test1. This commit deletes these files if existing already, prior to running the tests. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
-rw-r--r--libpod/lock/shm/shm_lock_test.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/lock/shm/shm_lock_test.go b/libpod/lock/shm/shm_lock_test.go
index 362821c62..cb83c7c2c 100644
--- a/libpod/lock/shm/shm_lock_test.go
+++ b/libpod/lock/shm/shm_lock_test.go
@@ -27,6 +27,8 @@ const lockPath = "/libpod_test"
// We need a test main to ensure that the SHM is created before the tests run
func TestMain(m *testing.M) {
+ // Remove prior /dev/shm/libpod_test
+ os.RemoveAll("/dev/shm" + lockPath)
shmLock, err := CreateSHMLock(lockPath, numLocks)
if err != nil {
fmt.Fprintf(os.Stderr, "Error creating SHM for tests: %v\n", err)
@@ -73,6 +75,8 @@ func runLockTest(t *testing.T, testFunc func(*testing.T, *SHMLocks)) {
// Test that creating an SHM with a bad size rounds up to a good size
func TestCreateNewSHMBadSizeRoundsUp(t *testing.T) {
+ // Remove prior /dev/shm/test1
+ os.RemoveAll("/dev/shm/test1")
// Odd number, not a power of 2, should never be a word size on a system
lock, err := CreateSHMLock("/test1", 7)
assert.NoError(t, err)