From: Daniel J Walsh <dwalsh@redhat.com>
To: Joshua Brindle <method@manicmethod.com>
Cc: SE Linux <selinux@tycho.nsa.gov>,
Karl MacMillan <karlwmacmillan@gmail.com>
Subject: Re: sepolgen unit tests fail
Date: Wed, 24 Mar 2010 13:08:23 -0400 [thread overview]
Message-ID: <4BAA4707.9080803@redhat.com> (raw)
In-Reply-To: <4BAA3B96.9000706@manicmethod.com>
[-- Attachment #1: Type: text/plain, Size: 24 bytes --]
Patch to fix unit test.
[-- Attachment #2: sepolgen_test.patch --]
[-- Type: text/plain, Size: 4292 bytes --]
diff --git a/sepolgen/tests/test_access.py b/sepolgen/tests/test_access.py
index 16d856e..fec699e 100644
--- a/sepolgen/tests/test_access.py
+++ b/sepolgen/tests/test_access.py
@@ -82,8 +82,8 @@ class TestAccessVector(unittest.TestCase):
a.obj_class = "file"
a.perms.update(["read", "write"])
- self.assertEquals(str(a), "allow foo bar : file { read write };")
- self.assertEquals(a.to_string(), "allow foo bar : file { read write };")
+ self.assertEquals(str(a), "allow foo bar:file { read write };")
+ self.assertEquals(a.to_string(), "allow foo bar:file { read write };")
def test_cmp(self):
a = access.AccessVector()
diff --git a/sepolgen/tests/test_interfaces.py b/sepolgen/tests/test_interfaces.py
index 674ccb9..b589bdf 100644
--- a/sepolgen/tests/test_interfaces.py
+++ b/sepolgen/tests/test_interfaces.py
@@ -86,17 +86,17 @@ interface(`files_search_usr',`
')
allow $1 usr_t:dir search;
- allow { domain $1 } { usr_t usr_home_t } : { file dir } { read write getattr };
+ allow { domain $1 } { usr_t usr_home_t }:{ file dir } { read write getattr };
typeattribute $1 file_type;
if (foo) {
- allow $1 foo : bar baz;
+ allow $1 foo:bar baz;
}
if (bar) {
- allow $1 foo : bar baz;
+ allow $1 foo:bar baz;
} else {
- allow $1 foo : bar baz;
+ allow $1 foo:bar baz;
}
')
@@ -135,8 +135,8 @@ interface(`foo',`
gen_require(`
type usr_t;
')
- allow $1 usr_t : dir { create add_name };
- allow $1 usr_t : file { read write };
+ allow $1 usr_t:dir { create add_name };
+ allow $1 usr_t:file { read write };
')
"""
@@ -145,16 +145,16 @@ interface(`foo',`
gen_require(`
type usr_t;
')
- allow $1 usr_t : dir { create add_name };
- allow $1 usr_t : file { read write };
+ allow $1 usr_t:dir { create add_name };
+ allow $1 usr_t:file { read write };
')
interface(`map', `
gen_require(`
type bar_t;
')
- allow $1 bar_t : file read;
- allow $2 bar_t : file write;
+ allow $1 bar_t:file read;
+ allow $2 bar_t:file write;
foo($2)
')
@@ -163,9 +163,9 @@ interface(`hard_map', `
gen_require(`
type baz_t;
')
- allow $1 baz_t : file getattr;
- allow $2 baz_t : file read;
- allow $3 baz_t : file write;
+ allow $1 baz_t:file getattr;
+ allow $2 baz_t:file read;
+ allow $3 baz_t:file write;
map($1, $2)
map($2, $3)
diff --git a/sepolgen/tests/test_matching.py b/sepolgen/tests/test_matching.py
index 63e89ed..2282eca 100644
--- a/sepolgen/tests/test_matching.py
+++ b/sepolgen/tests/test_matching.py
@@ -98,16 +98,16 @@ interface(`foo',`
gen_require(`
type usr_t;
')
- allow $1 usr_t : dir { create add_name };
- allow $1 usr_t : file { read write };
+ allow $1 usr_t:dir { create add_name };
+ allow $1 usr_t:file { read write };
')
interface(`map', `
gen_require(`
type bar_t;
')
- allow $1 bar_t : file read;
- allow $2 bar_t : file write;
+ allow $1 bar_t:file read;
+ allow $2 bar_t:file write;
foo($2)
')
@@ -116,9 +116,9 @@ interface(`hard_map', `
gen_require(`
type baz_t;
')
- allow $1 baz_t : file getattr;
- allow $2 baz_t : file read;
- allow $3 baz_t : file write;
+ allow $1 baz_t:file getattr;
+ allow $2 baz_t:file read;
+ allow $3 baz_t:file write;
map($1, $2)
map($2, $3)
diff --git a/sepolgen/tests/test_refparser.py b/sepolgen/tests/test_refparser.py
index c5f7278..3fe6d79 100644
--- a/sepolgen/tests/test_refparser.py
+++ b/sepolgen/tests/test_refparser.py
@@ -37,17 +37,17 @@ interface(`files_search_usr',`
')
allow $1 usr_t:dir search;
- allow { domain $1 } { usr_t usr_home_t } : { file dir } { read write getattr };
+ allow { domain $1 } { usr_t usr_home_t }:{ file dir } { read write getattr };
typeattribute $1 file_type;
if (foo) {
- allow $1 foo : bar baz;
+ allow $1 foo:bar baz;
}
if (bar) {
- allow $1 foo : bar baz;
+ allow $1 foo:bar baz;
} else {
- allow $1 foo : bar baz;
+ allow $1 foo:bar baz;
}
')
next prev parent reply other threads:[~2010-03-24 17:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-24 16:19 sepolgen unit tests fail Joshua Brindle
2010-03-24 16:41 ` Daniel J Walsh
2010-03-24 17:08 ` Daniel J Walsh [this message]
2010-03-24 17:47 ` Joshua Brindle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BAA4707.9080803@redhat.com \
--to=dwalsh@redhat.com \
--cc=karlwmacmillan@gmail.com \
--cc=method@manicmethod.com \
--cc=selinux@tycho.nsa.gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.