mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2024-12-23 21:46:44 +01:00
refractor(aa): move some test resource to the testdata dir.
This commit is contained in:
parent
89abbae6bd
commit
4282fb336e
8 changed files with 25 additions and 15 deletions
|
@ -5,9 +5,14 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
var (
|
||||
testdata = "../../tests/testdata/logs"
|
||||
)
|
||||
|
||||
func Test_app(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
|
@ -20,7 +25,7 @@ func Test_app(t *testing.T) {
|
|||
{
|
||||
name: "Test audit.log",
|
||||
logger: "auditd",
|
||||
path: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
profile: "",
|
||||
rules: false,
|
||||
wantErr: false,
|
||||
|
@ -28,7 +33,7 @@ func Test_app(t *testing.T) {
|
|||
{
|
||||
name: "Test audit.log to rules",
|
||||
logger: "auditd",
|
||||
path: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
profile: "",
|
||||
rules: true,
|
||||
wantErr: false,
|
||||
|
@ -36,7 +41,7 @@ func Test_app(t *testing.T) {
|
|||
{
|
||||
name: "Test Dbus Session",
|
||||
logger: "systemd",
|
||||
path: "../../tests/systemd.log",
|
||||
path: filepath.Join(testdata, "systemd.log"),
|
||||
profile: "",
|
||||
rules: false,
|
||||
wantErr: false,
|
||||
|
@ -44,7 +49,7 @@ func Test_app(t *testing.T) {
|
|||
{
|
||||
name: "No logfile",
|
||||
logger: "auditd",
|
||||
path: "../../tests/log",
|
||||
path: filepath.Join(testdata, "log"),
|
||||
profile: "",
|
||||
rules: false,
|
||||
wantErr: true,
|
||||
|
@ -52,7 +57,7 @@ func Test_app(t *testing.T) {
|
|||
{
|
||||
name: "Logger not supported",
|
||||
logger: "raw",
|
||||
path: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
profile: "",
|
||||
rules: false,
|
||||
wantErr: true,
|
||||
|
|
|
@ -20,7 +20,7 @@ func chdirGitRoot() {
|
|||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
root := string(out)[0 : len(out)-1]
|
||||
root := string(out[0 : len(out)-1])
|
||||
if err := os.Chdir(root); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
|
|
@ -13,8 +13,8 @@ import (
|
|||
)
|
||||
|
||||
var (
|
||||
testData = paths.New("../../").Join("tests")
|
||||
intData = paths.New("../../").Join("apparmor.d")
|
||||
testData = paths.New("../../tests/testdata/")
|
||||
intData = paths.New("../../apparmor.d")
|
||||
)
|
||||
|
||||
func TestAppArmorProfileFile_String(t *testing.T) {
|
||||
|
|
|
@ -5,10 +5,15 @@
|
|||
package logs
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
var (
|
||||
testdata = "../../tests/testdata/logs"
|
||||
)
|
||||
|
||||
func TestGetJournalctlLogs(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
|
@ -19,7 +24,7 @@ func TestGetJournalctlLogs(t *testing.T) {
|
|||
{
|
||||
name: "gsd-xsettings",
|
||||
useFile: true,
|
||||
path: "../../tests/systemd.log",
|
||||
path: filepath.Join(testdata, "systemd.log"),
|
||||
want: AppArmorLogs{
|
||||
{
|
||||
"apparmor": "ALLOWED",
|
||||
|
@ -60,8 +65,8 @@ func TestSelectLogFile(t *testing.T) {
|
|||
}{
|
||||
{
|
||||
name: "Get audit.log",
|
||||
path: "../../tests/audit.log",
|
||||
want: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
want: filepath.Join(testdata, "audit.log"),
|
||||
},
|
||||
{
|
||||
name: "Get /var/log/audit/audit.log.1",
|
||||
|
|
|
@ -188,7 +188,7 @@ func TestNewApparmorLogs(t *testing.T) {
|
|||
}{
|
||||
{
|
||||
name: "dnsmasq",
|
||||
path: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
want: AppArmorLogs{
|
||||
{
|
||||
"apparmor": "DENIED",
|
||||
|
@ -233,17 +233,17 @@ func TestNewApparmorLogs(t *testing.T) {
|
|||
},
|
||||
{
|
||||
name: "kmod",
|
||||
path: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
want: refKmod,
|
||||
},
|
||||
{
|
||||
name: "man",
|
||||
path: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
want: refMan,
|
||||
},
|
||||
{
|
||||
name: "power-profiles-daemon",
|
||||
path: "../../tests/audit.log",
|
||||
path: filepath.Join(testdata, "audit.log"),
|
||||
want: refPowerProfiles,
|
||||
},
|
||||
}
|
||||
|
|
0
tests/string.aa → tests/testdata/string.aa
vendored
0
tests/string.aa → tests/testdata/string.aa
vendored
Loading…
Reference in a new issue