[apparmor] [patch] [12/38] Change RE_PROFILE_BARE_FILE_ENTRY and RE_PROFILE_PATH_ENTRY imports in test-regex_matches.py

[Christian Boltz]

Hello,

Patch 14 will drop the RE_PROFILE_PATH_ENTRY and
RE_PROFILE_BARE_FILE_ENTRY import from apparmor.aa.
This would break test-regex_matches.py, therefore
import these regexes from apparmor.regex.



[ 12-test-regex_matches-change-imports.diff ]

=== modified file ./utils/test/test-regex_matches.py
--- utils/test/test-regex_matches.py	2016-02-01 21:31:56.415302976 +0100
+++ utils/test/test-regex_matches.py	2016-01-26 22:22:31.505637218 +0100
@@ -15,6 +15,7 @@
 from apparmor.common import AppArmorBug, AppArmorException
 
 from apparmor.regex import ( strip_parenthesis, strip_quotes, parse_profile_start_line, re_match_include,
+     RE_PROFILE_BARE_FILE_ENTRY, RE_PROFILE_PATH_ENTRY,
      RE_PROFILE_START, RE_PROFILE_DBUS, RE_PROFILE_CAP, RE_PROFILE_PTRACE, RE_PROFILE_SIGNAL )
 
 
@@ -220,7 +221,7 @@
     '''Tests for RE_PROFILE_PATH_ENTRY'''
 
     def AASetup(self):
-        self.regex = aa.RE_PROFILE_PATH_ENTRY
+        self.regex = RE_PROFILE_PATH_ENTRY
 
     tests = [
         ('   /tmp/foo r,',
@@ -239,7 +240,7 @@
     '''Tests for RE_PROFILE_BARE_FILE_ENTRY'''
 
     def AASetup(self):
-        self.regex = aa.RE_PROFILE_BARE_FILE_ENTRY
+        self.regex = RE_PROFILE_BARE_FILE_ENTRY
 
     tests = [
         ('   file,', (None, None, None, None)),



Regards,

Christian Boltz
-- 
Bill Gates bei einer Privataudienz beim Papst: "Ich biete 100 Millionen
Dollar, wenn das "Vater unser" geändert wird." - "Was haben Sie sich
vorgestellt?" - "Es soll heißen: Unser tägliches Windows gib uns heute."
Der Papst denkt kurz nach, greift zum Haustelefon: "Sofort den Vertrag
beim Bäcker kündigen!"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20160812/a75cd226/attachment-0001.pgp>