#485 fix the tests which fail on CentOS
Merged 21 days ago by mmalik. Opened a month ago by mmalik.
tests/ mmalik/selinux adapt-to-centos-runs  into  main

@@ -31,7 +31,7 @@ 

  

  PACKAGE="checkpolicy"

  # TODO: repeat for all policy modules that are installed under /etc/selinux

- if rlIsFedora ; then

+ if rlIsFedora || rlIsCentOS ; then

      POLICY_FILE="`find /var/lib/selinux/targeted -type d -name base`/hll"

  elif rlIsRHEL '<7.3' ; then

      POLICY_FILE=`find /etc/selinux/targeted -type f -name base.pp`
@@ -43,7 +43,7 @@ 

      rlPhaseStartSetup

          rlAssertRpm ${PACKAGE}

          OUTPUT_FILE=`mktemp`

-         if rlIsRHEL '>=7.3' || rlIsFedora ; then

+         if rlIsRHEL '>=7.3' || rlIsCentOS || rlIsFedora ; then

              rlRun "semodule -H -E base"

          else

              rlRun "cp ${POLICY_FILE} ./base.pp.bz2"

@@ -40,7 +40,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlAssertRpm ${PACKAGE}

          rlRun "rpm -qf `which validatetrans`"

          rlRun "rpm -qf `which seinfo`"

@@ -16,7 +16,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport selinux-policy/common"

+         rlRun "rlImport selinux-policy/common" 0,1

          rlRun "uname -a"

          rlRun "sestatus"

      rlPhaseEnd

@@ -45,7 +45,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -48,7 +48,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -44,7 +44,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -46,7 +46,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -42,7 +42,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -44,7 +44,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -44,7 +44,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-mls

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -34,7 +34,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -37,7 +37,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-mls

@@ -45,7 +45,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -36,7 +36,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -33,7 +33,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -42,7 +42,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -44,7 +44,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,9 +39,9 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

-         SERVICE_PACKAGE=`rpm -qf ${FILE_PATH}`

+         SERVICE_PACKAGE=`rpm -qf ${FILE_PATH} | head -n 1`

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

          rlAssertRpm ${SERVICE_PACKAGE}

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -47,7 +47,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -37,7 +37,7 @@ 

      rlLog "If this test fails, please contact mmalik on IRC #selinux"

      rlLog "This test should fail if tested bugs are NOT fixed yet"

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -46,7 +46,7 @@ 

              exit 0

          fi

  

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -35,7 +35,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -45,7 +45,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -38,7 +38,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -42,7 +42,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -33,7 +33,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -46,7 +46,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -95,7 +95,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESetEnforce

          rlSEStatus

          rlSESetTimestamp

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -34,7 +34,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -22,7 +22,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlImport 'selinux-policy/common'

+         rlImport 'selinux-policy/common' 0,1

  

          rlAssertRpm selinux-policy

          rlAssertRpm selinux-policy-targeted

@@ -44,7 +44,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -38,7 +38,7 @@ 

          exit 0

      fi

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -38,7 +38,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -46,7 +46,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -37,7 +37,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -36,7 +36,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -41,7 +41,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -36,7 +36,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -37,7 +37,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -70,7 +70,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -35,7 +35,7 @@ 

      rlLog "If this test fails, please contact mmalik on IRC #selinux"

      rlLog "This test should fail if tested bugs are NOT fixed yet"

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

          rlAssertRpm perf

@@ -38,7 +38,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -43,7 +43,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -45,7 +45,7 @@ 

      rlLog "If this test fails, please contact mmalik or IRC #selinux"

      rlLog "This test should fail if tested bugs are NOT fixed yet"

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -44,7 +44,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlAssertRpm $PACKAGE

          rlAssertRpm $SERVICE_PACKAGE

          rlSESetEnforce

@@ -64,7 +64,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -42,7 +42,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -46,7 +46,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -45,7 +45,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -33,7 +33,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -41,7 +41,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -50,7 +50,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -34,7 +34,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -42,7 +42,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -116,7 +116,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE1}

          rlAssertRpm ${PACKAGE1}-targeted

@@ -7,7 +7,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

          rlAssertRpm ${SERVICE_PACKAGE}

@@ -45,7 +45,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -41,7 +41,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -41,7 +41,7 @@ 

      rlLog "If this test fails, please contact mmalik on IRC #selinux"

      rlLog "This test should fail if tested bugs are NOT fixed yet"

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -32,7 +32,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -36,7 +36,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          SERVICE_PACKAGE=`rpm -qf ${FILE_PATH} | head -n 1`

          rlAssertRpm ${PACKAGE}

@@ -48,7 +48,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -39,7 +39,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -40,7 +40,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -46,7 +46,7 @@ 

      fi

  

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

@@ -66,16 +66,12 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

          rlRun "rpm -qa libvirt\*"

  

-         rlRun "sed -i 's/^.*task.*never.*$//' /etc/audit/rules.d/audit.rules"

-         rlRun "echo '-w /etc/shadow -p w' >> /etc/audit/rules.d/audit.rules"

-         rlRun "service auditd restart"

- 

          rlServiceStop ${SERVICE_NAMES}

          rlFileBackup /etc/shadow

  

@@ -33,7 +33,7 @@ 

  

  rlJournalStart

      rlPhaseStartSetup

-         rlRun "rlImport 'selinux-policy/common'"

+         rlRun "rlImport 'selinux-policy/common'" 0,1

          rlSESatisfyRequires

          rlAssertRpm ${PACKAGE}

          rlAssertRpm ${PACKAGE}-targeted

rebased onto dd5b687

a month ago

rebased onto f37e32f

a month ago

rebased onto d387214

a month ago

rebased onto 26a276d

a month ago

Majority of the modified tests pass as expected.
The rest of them fails because of the following reasons:
* incorrect labels on disk -> /selinux-policy/bz533007-unable-to-start-kdump-service
* not yet reported AVCs -> /selinux-policy/systemd-userdbd-and-similar
* not yet fixed bug RHEL-16104 -> /selinux-policy/dmidecode-and-similar
* the service dumps core -> /selinux-policy/sslh-and-similar
* not yet fixed bz#2270484 -> /selinux-policy/logwatch-and-similar
* non-existent /dev/dsp -> /selinux-policy/nasd-and-similar
* incorrect labels on disk -> /selinux-policy/bz562833-chrooted-named-file-contexts
* unrelated AVCs -> /selinux-policy/systemd-run-and-similar
* the service dumps core -> /selinux-policy/stalld-and-similar
* not yet fixed bz#2269708 -> /selinux-policy/dhcpcd-and-similar
* not yet reported AVCs -> /selinux-policy/pam_limits-and-related
* incorrect labels on disk -> /selinux-policy/fapolicyd-and-similar
* unrelated AVCs -> /selinux-policy/accounts-daemon-and-similar
* not yet fixed bz#2270895 -> /selinux-policy/anon_inode-and-similar
* not yet fixed bz#2207725 -> /selinux-policy/snapd-and-similar
* not yet fixed bz#2221019 -> /selinux-policy/tlp-and-similar
* not yet reported AVCs -> /selinux-policy/ladvd
* incorrect labels on disk -> /selinux-policy/pcp-daemons-and-similar

Pull-Request has been merged by mmalik

21 days ago
Metadata
Changes Summary 90
+2 -2
file changed
checkpolicy/sedismod/runtest.sh
+1 -1
file changed
libselinux/validatetrans/runtest.sh
+1 -1
file changed
selinux-policy/Library/common/runtest.sh
+1 -1
file changed
selinux-policy/ModemManager-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/accounts-daemon-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/acpid-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/anon_inode-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/bgpd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/blueman-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/boinc-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/boltd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/bootupd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/bz481628-send-msg-to-dbus/runtest.sh
+1 -1
file changed
selinux-policy/bz533007-unable-to-start-kdump-service/runtest.sh
+1 -1
file changed
selinux-policy/bz538089-plymouth-operations-denied-during-boot/runtest.sh
+1 -1
file changed
selinux-policy/bz562833-chrooted-named-file-contexts/runtest.sh
+1 -1
file changed
selinux-policy/bz624405-pcsc-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/bz733494-amanda-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/caddy-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/capability2-class/runtest.sh
+1 -1
file changed
selinux-policy/chronyd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/cockpit-ws-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/colord-and-similar/runtest.sh
+2 -2
file changed
selinux-policy/cups-browsed-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/cups-lpd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/cups-pdf-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/dhclient-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/dhcpcd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/dmidecode-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/exim-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/fapolicyd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/fedora-third-party-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/firewalld-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/fwupd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/getrlimit-permission/runtest.sh
+1 -1
file changed
selinux-policy/hostapd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/icecast-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/install-uninstall-dsp-packages/runtest.sh
+1 -1
file changed
selinux-policy/journalctl-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/kerberos-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/kernel-confined-exec/runtest.sh
+1 -1
file changed
selinux-policy/ksm-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/ladvd/runtest.sh
+1 -1
file changed
selinux-policy/logwatch-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/nasd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/nfsdcld-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/ntpsec-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/numad-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/nvme-stas-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/opensmtpd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/pam_console-and-related/runtest.sh
+1 -1
file changed
selinux-policy/pam_limits-and-related/runtest.sh
+1 -1
file changed
selinux-policy/pam_timestamp-and-related/runtest.sh
+1 -1
file changed
selinux-policy/pcp-daemons-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/perf_event-and-related/runtest.sh
+1 -1
file changed
selinux-policy/ping-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/policykit-general/runtest.sh
+1 -1
file changed
selinux-policy/rngd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/rpc.idmapd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/rpmdb-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/rrdcached-service-and-related/runtest.sh
+1 -1
file changed
selinux-policy/rsyslog-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/rtkit-daemon-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/smbcontrol-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/snapd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/sslh-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/stalld-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/sudo-and-dnf/runtest.sh
+1 -1
file changed
selinux-policy/swap-file-and-systemd-access/runtest.sh
+1 -1
file changed
selinux-policy/synce4l-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-bootchart-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-creds/runtest.sh
+1 -1
file changed
selinux-policy/systemd-generators/runtest.sh
+1 -1
file changed
selinux-policy/systemd-homed/runtest.sh
+1 -1
file changed
selinux-policy/systemd-localed/runtest.sh
+1 -1
file changed
selinux-policy/systemd-machined-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-modules-load-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-notify-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-rfkill-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-run-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-sysctl-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-timesyncd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/systemd-userdbd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/targetd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/thttpd-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/tlp-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/usbguard-daemon-and-similar/runtest.sh
+1 -1
file changed
selinux-policy/usbmuxd-and-similar/runtest.sh
+1 -5
file changed
selinux-policy/virtualization-daemons/runtest.sh
+1 -1
file changed
selinux-policy/watch-permissions/runtest.sh