From 6d38603a7977cf0f450b137408d81ea5e87ddfed Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Thu, 13 Aug 2020 15:29:17 +0200
Subject: [PATCH] skip parts of nacm_recovery test when user runs as root

---
 docker/main/startsystem_fcgi.sh | 2 +-
 test/test_nacm_recovery.sh      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/main/startsystem_fcgi.sh b/docker/main/startsystem_fcgi.sh
index fe3ab23c..329fb9af 100755
--- a/docker/main/startsystem_fcgi.sh
+++ b/docker/main/startsystem_fcgi.sh
@@ -88,7 +88,7 @@ EOF
 # - test_order.sh XXX this is a bug need debugging
 cat <<EOF > /usr/local/bin/test/site.sh
 # Add your local site specific env variables (or tests) here.
-SKIPLIST="test_api.sh test_c++.sh test_yangmodels.sh test_openconfig.sh test_install.sh test_nacm_recovery.sh test_privileges.sh"
+SKIPLIST="test_api.sh test_c++.sh test_yangmodels.sh test_openconfig.sh test_install.sh test_privileges.sh"
 #IETFRFC=
 EOF
 
diff --git a/test/test_nacm_recovery.sh b/test/test_nacm_recovery.sh
index 834bcd42..e70e72bf 100755
--- a/test/test_nacm_recovery.sh
+++ b/test/test_nacm_recovery.sh
@@ -42,7 +42,6 @@ EOF
 # The rule-list is from A.2
 RULES='<x xmlns="urn:example:nacm">0</x><nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm"><enable-nacm>true</enable-nacm><read-default>permit</read-default><write-default>permit</write-default><exec-default>permit</exec-default><enable-external-groups>true</enable-external-groups></nacm>'
 
-
 DEFAULT='<nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm"><enable-nacm>true</enable-nacm><read-default>permit</read-default><write-default>deny</write-default><exec-default>permit</exec-default><enable-external-groups>true</enable-external-groups></nacm>'
 
 # Arguments:
@@ -149,6 +148,7 @@ EOF
 }
 
 #------- CRED: except USER: non-root
+if [ "$USER" != root ]; then # Skip if USER is root
 # This is default, therefore first
 CRED=except 
 REALUSER=$USER
@@ -176,6 +176,8 @@ RECOVERY=$USER
 new "cred: $CRED realuser:$REALUSER pseudo:$PSEUDO recovery:$RECOVERY"
 testrun $CRED $REALUSER $PSEUDO $RECOVERY false false
 
+fi # skip is USER is root
+
 #------- CRED: except USER: root
 CRED=except 
 REALUSER=root 
@@ -203,7 +205,6 @@ RECOVERY=root
 new "cred: $CRED realuser:$REALUSER pseudo:$PSEUDO recovery:$RECOVERY"
 testrun $CRED $REALUSER $PSEUDO $RECOVERY true false
 
-
 #------- CRED: none
 # Check you can use any pseudo user if cred is none
 CRED=none