Skip to content

Omit any SELinux trailing dot from ls to fix test.#64

Open
schmonz wants to merge 1 commit intobruceg:masterfrom
schmonz:test-supervise-lock-selinux-ls-fix
Open

Omit any SELinux trailing dot from ls to fix test.#64
schmonz wants to merge 1 commit intobruceg:masterfrom
schmonz:test-supervise-lock-selinux-ls-fix

Conversation

@schmonz
Copy link
Copy Markdown

@schmonz schmonz commented Jan 25, 2020

I saw these test failures on at least CentOS 6 and 7:

@@ -269,16 +269,16 @@
 test.sv: down ok
 test.sv log: down ok
 --- supervise leaves locked service intact
-prw------- 0 control
--rw------- 0 lock
-prw------- 0 ok
--rw-r--r-- 20 status
+prw-------. 0 control
+-rw-------. 0 lock
+prw-------. 0 ok
+-rw-r--r--. 20 status
 supervise: fatal: unable to acquire supervise/lock: temporary failure
 111
-prw------- 0 control
--rw------- 0 lock
-prw------- 0 ok
--rw-r--r-- 20 status
+prw-------. 0 control
+-rw-------. 0 lock
+prw-------. 0 ok
+-rw-r--r--. 20 status
 0
 test.sv: supervise not running
 0

The trailing . evidently means a file has some SELinux context (which can then be viewed with ls -Z). For this test's purposes, we can just leave it out.

I saw these test failures on at least CentOS 6 and 7:

@@ -269,16 +269,16 @@
 test.sv: down ok
 test.sv log: down ok
 --- supervise leaves locked service intact
-prw------- 0 control
--rw------- 0 lock
-prw------- 0 ok
--rw-r--r-- 20 status
+prw-------. 0 control
+-rw-------. 0 lock
+prw-------. 0 ok
+-rw-r--r--. 20 status
 supervise: fatal: unable to acquire supervise/lock: temporary failure
 111
-prw------- 0 control
--rw------- 0 lock
-prw------- 0 ok
--rw-r--r-- 20 status
+prw-------. 0 control
+-rw-------. 0 lock
+prw-------. 0 ok
+-rw-r--r--. 20 status
 0
 test.sv: supervise not running
 0

The trailing `.` evidently means a file has some SELinux context
(which can then be viewed with `ls -Z`). For this test's purposes,
we can just leave it out.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant