functional tests: fix userns test

We create the rkt-inspect.aci with a rootfs with permissions 755 and then check that those are 755 at execution time. Also, we check stage1's rootfs permissions, they should always be 750.
rkt · Oct 15, 2015 · b154431 · b154431
1 parent f6ad96c
commit b154431
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tests/functional.mk b/tests/functional.mk
@@ -29,7 +29,8 @@ FTST_EMPTY_IMAGE_MANIFEST := $(FTST_EMPTY_IMAGE_DIR)/manifest
 
 TOPLEVEL_CHECK_STAMPS += $(FTST_FUNCTIONAL_TESTS_STAMP)
 INSTALL_FILES += $(FTST_IMAGE_MANIFEST_SRC):$(FTST_IMAGE_MANIFEST):- $(FTST_INSPECT_BINARY):$(FTST_ACI_INSPECT):- $(FTST_EMPTY_IMAGE_MANIFEST_SRC):$(FTST_EMPTY_IMAGE_MANIFEST):- $(FTST_ACE_MAIN_IMAGE_MANIFEST_SRC):$(FTST_ACE_MAIN_IMAGE_MANIFEST):- $(FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC):$(FTST_ACE_SIDEKICK_IMAGE_MANIFEST):- $(FTST_ECHO_SERVER_BINARY):$(FTST_ACI_ECHO_SERVER):-
-CREATE_DIRS += $(FTST_IMAGE_DIR) $(FTST_IMAGE_ROOTFSDIR) $(FTST_EMPTY_IMAGE_DIR) $(FTST_EMPTY_IMAGE_ROOTFSDIR) $(FTST_IMAGE_TEST_DIRS) $(FTST_TEST_TMP)
+CREATE_DIRS += $(FTST_IMAGE_DIR) $(FTST_EMPTY_IMAGE_DIR) $(FTST_EMPTY_IMAGE_ROOTFSDIR) $(FTST_IMAGE_TEST_DIRS) $(FTST_TEST_TMP)
+INSTALL_DIRS += $(FTST_IMAGE_ROOTFSDIR):0755
 CLEAN_FILES += $(FTST_IMAGE) $(FTST_ECHO_SERVER_BINARY) $(FTST_INSPECT_BINARY) $(FTST_EMPTY_IMAGE) $(FTST_IMAGE_ROOTFSDIR)/dir1/file $(FTST_IMAGE_ROOTFSDIR)/dir2/file $(FTST_ACE_BINARY)
 CLEAN_DIRS += $(FTST_IMAGE_ROOTFSDIR)/dir1 $(FTST_IMAGE_ROOTFSDIR)/dir2
 CLEAN_SYMLINKS += $(FTST_IMAGE_ROOTFSDIR)/inspect-link

diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
@@ -31,18 +31,20 @@ var usernsTests = []struct {
 }{
 	{
 		`^RKT_BIN^ --debug --insecure-skip-verify run ^USERNS^ --no-overlay --set-env=FILE=^FILE^ --mds-register=false ^IMAGE^`,
-		"/",    // stage2 rootfs ($POD/stage1/rootfs/opt/stage2/rkt-inspect)
-		"drwx", // TODO: revisit the permissions with #1581
+		"/", // stage2 rootfs ($POD/stage1/rootfs/opt/stage2/rkt-inspect)
+		"drwxr-xr-x",
 		"0",
 		"0",
 	},
 	{
 		`^RKT_BIN^ --debug --insecure-skip-verify run ^USERNS^ --no-overlay --set-env=FILE=^FILE^ --mds-register=false ^IMAGE^`,
 		"/proc/1/root/", // stage1 rootfs ($POD/stage1/rootfs)
-		"drwx",          // TODO: revisit the permissions with #1581
+		"drwxr-x---",
 		"0",
 		"", // no check: it could be 0 but also the gid of 'rkt', see https://github.com/coreos/rkt/pull/1452
 	},
+	// TODO test with overlay fs too. We don't test it for now because
+	// Semaphore doesn't support it.
 }
 
 func TestUserns(t *testing.T) {